This is the mail archive of the
ecos-patches@sourceware.org
mailing list for the eCos project.
configtool patch to build with latest Cygwin
- From: John Clark <clarkjc at runbox dot com>
- To: ecos-patches at sourceware dot org
- Date: Wed, 15 Nov 2006 03:25:31 -0500
- Subject: configtool patch to build with latest Cygwin
Hello,
I'm new to developing with eCos, and I had a little difficulty building
the configtool under the latest version of the Cygwin environment. I've
attached a patch with the changes I had to make to get it to build.
For reference, here is a list of the versions of the pertinent Cygwin
packages in my installation:
Package Version
binutils 20060817-1
cygwin 1.5.22-1
gcc-core 3.4.4-1
gcc-g++ 3.4.4-1
w32api 3.7-1
- John
diff -r -u cvs/ecos/host/tools/configtool/standalone/wxwin/appsettings.cpp ecos/host/tools/configtool/standalone/wxwin/appsettings.cpp
--- cvs/ecos/host/tools/configtool/standalone/wxwin/appsettings.cpp 2003-05-02 09:58:08.000000000 -0400
+++ ecos/host/tools/configtool/standalone/wxwin/appsettings.cpp 2006-11-15 02:42:05.953125000 -0500
@@ -75,9 +75,6 @@
#ifdef __WXMSW__
#include <windows.h>
#include "wx/msw/winundef.h"
-#ifdef GetTempPath
-#undef GetTempPath
-#endif
#endif
/*
diff -r -u cvs/ecos/host/tools/configtool/standalone/wxwin/configtooldoc.cpp ecos/host/tools/configtool/standalone/wxwin/configtooldoc.cpp
--- cvs/ecos/host/tools/configtool/standalone/wxwin/configtooldoc.cpp 2003-05-14 14:16:59.000000000 -0400
+++ ecos/host/tools/configtool/standalone/wxwin/configtooldoc.cpp 2006-11-15 02:42:05.968750000 -0500
@@ -73,9 +73,6 @@
#include <shlobj.h>
#endif
#include "wx/msw/winundef.h"
-#ifdef CreateDirectory
-#undef CreateDirectory
-#endif
#endif
#include "configtooldoc.h"
diff -r -u cvs/ecos/host/tools/configtool/standalone/wxwin/ecpch.h ecos/host/tools/configtool/standalone/wxwin/ecpch.h
--- cvs/ecos/host/tools/configtool/standalone/wxwin/ecpch.h 2003-03-19 12:39:06.000000000 -0500
+++ ecos/host/tools/configtool/standalone/wxwin/ecpch.h 2006-11-15 02:42:05.984375000 -0500
@@ -54,9 +54,12 @@
// FIXME: including winsock2.h early causes build failures
// relating to the CreateDialog macro defined in the w32api.
// Need to find a better point to #include <winsock2.h>
-//#ifdef __CYGWIN__
-//#include <winsock2.h>
-//#endif
+#ifdef __CYGWIN__
+#include <winsock2.h>
+#ifdef CreateDialog
+#undef CreateDialog
+#endif
+#endif
#include "wx/wx.h"
#include "wx/splitter.h"
diff -r -u cvs/ecos/host/tools/configtool/standalone/wxwin/filename.cpp ecos/host/tools/configtool/standalone/wxwin/filename.cpp
--- cvs/ecos/host/tools/configtool/standalone/wxwin/filename.cpp 2003-03-19 12:39:06.000000000 -0500
+++ ecos/host/tools/configtool/standalone/wxwin/filename.cpp 2006-11-15 02:42:06.000000000 -0500
@@ -48,21 +48,6 @@
#include <shlwapi.h>
#include "wx/msw/winundef.h"
-#ifdef CreateDirectory
-#undef CreateDirectory
-#endif
-#ifdef ExpandEnvironmentStrings
-#undef ExpandEnvironmentStrings
-#endif
-#ifdef GetCurrentDirectory
-#undef GetCurrentDirectory
-#endif
-#ifdef SetCurrentDirectory
-#undef SetCurrentDirectory
-#endif
-#ifdef GetTempPath
-#undef GetTempPath
-#endif
#else