AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Michael Wetherell 2005-06-22 20:58:47 +00:00
parent fc7d8071d0
commit 7275146d4d
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure vendored
View File

@ -10562,6 +10562,7 @@ case "${host}" in
*-*-cygwin*) *-*-cygwin*)
if test "$wxUSE_MSW" = 1 ; then if test "$wxUSE_MSW" = 1 ; then
wants_win32=1 wants_win32=1
BAKEFILE_FORCE_PLATFORM=win32
else else
doesnt_want_win32=1 doesnt_want_win32=1
fi fi

1
configure.in
View File

@ -1328,6 +1328,7 @@ case "${host}" in
*-*-cygwin*) *-*-cygwin*)
if test "$wxUSE_MSW" = 1 ; then if test "$wxUSE_MSW" = 1 ; then
wants_win32=1 wants_win32=1
BAKEFILE_FORCE_PLATFORM=win32
else else
doesnt_want_win32=1 doesnt_want_win32=1
fi fi

3
include/wx/dlimpexp.h
View File

@ -48,6 +48,9 @@
# define WXEXPORT __declspec(export) # define WXEXPORT __declspec(export)
# define WXIMPORT __declspec(import) # define WXIMPORT __declspec(import)
# endif # endif
#elif defined(__CYGWIN__)
# define WXEXPORT __declspec(dllexport)
# define WXIMPORT __declspec(dllimport)
#endif #endif
/* for other platforms/compilers we don't anything */ /* for other platforms/compilers we don't anything */

6
include/wx/platform.h
View File

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