Unrevert Cygwin changes after discussion. Cygwin will be unix with the new

version of bakefile, but allow wxMSW to stay a Windows build until there is
a unix version of it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index 1ad8bf56e96add16a4cdbd0f22834716de23184e..276b6342e8a40350e65d1109e6660900c6222804 100755 (executable)
--- a/configure
+++ b/configure
@@ -10562,6 +10562,7 @@ case "${host}" in
   *-*-cygwin*)
       if test "$wxUSE_MSW" = 1 ; then
         wants_win32=1
+        BAKEFILE_FORCE_PLATFORM=win32
       else
         doesnt_want_win32=1
       fi

diff --git a/configure.in b/configure.in
index 1c093c21cc3ee3935d5554a856ca7fde39f2b77d..81a1782bfed256d6cd150a3d75b2a95511c27b80 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1328,6 +1328,7 @@ case "${host}" in
   *-*-cygwin*)
       if test "$wxUSE_MSW" = 1 ; then
         wants_win32=1
+        BAKEFILE_FORCE_PLATFORM=win32
       else
         doesnt_want_win32=1
       fi

diff --git a/include/wx/dlimpexp.h b/include/wx/dlimpexp.h
index 6bdfbf458b3cf1109378797171d19a6ac5e1bf7d..16e58d497495c34ad373c19f5691618bc1f3847a 100644 (file)
--- a/include/wx/dlimpexp.h
+++ b/include/wx/dlimpexp.h
@@ -48,6 +48,9 @@
 #        define WXEXPORT __declspec(export)
 #        define WXIMPORT __declspec(import)
 #    endif
+#elif defined(__CYGWIN__)
+#    define WXEXPORT __declspec(dllexport)
+#    define WXIMPORT __declspec(dllimport)
 #endif
 
 /* for other platforms/compilers we don't anything */

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 6bb277a2bf538f911a7ca66a542070957b84a4fc..c78751eee6126e3cf9742c3269e8819f33c4a57c 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -57,9 +57,7 @@
    first define Windows symbols if they're not defined on the command line: we
    can autodetect everything we need if _WIN32 is defined
  */
-#if defined(__CYGWIN32__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) \
-    && !defined(__WXX11__)
-    /* for Cygwin, default to wxMSW unless otherwise specified */
+#if defined(__CYGWIN__) && defined(__WINDOWS__)
 #    ifndef __WXMSW__
 #        define __WXMSW__
 #    endif
@@ -499,7 +497,7 @@
    at least maj.min
  */
 #if ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
-    defined( __CYGWIN__ ) || \
+    ( defined( __CYGWIN__ ) && defined( __WINDOWS__ ) ) || \
       (defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \
     !defined(__DOS__) && \
     !defined(__WXMOTIF__) && \