Revert Cygwin changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
023e504bf1
commit
ff8fbb8dbe
1
configure
vendored
1
configure
vendored
@ -10562,7 +10562,6 @@ case "${host}" in
|
||||
*-*-cygwin*)
|
||||
if test "$wxUSE_MSW" = 1 ; then
|
||||
wants_win32=1
|
||||
BAKEFILE_FORCE_PLATFORM=win32
|
||||
else
|
||||
doesnt_want_win32=1
|
||||
fi
|
||||
|
@ -1328,7 +1328,6 @@ case "${host}" in
|
||||
*-*-cygwin*)
|
||||
if test "$wxUSE_MSW" = 1 ; then
|
||||
wants_win32=1
|
||||
BAKEFILE_FORCE_PLATFORM=win32
|
||||
else
|
||||
doesnt_want_win32=1
|
||||
fi
|
||||
|
@ -48,9 +48,6 @@
|
||||
# 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 */
|
||||
|
@ -57,9 +57,9 @@
|
||||
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(__CYGWIN__) && defined(__WINDOWS__)
|
||||
/* for Cygwin, a build of wxMSW, or a build with -mno-cygwin is treated
|
||||
* as a Windows build. Otherwise it is treated as a unix compiler. */
|
||||
#if defined(__CYGWIN32__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) \
|
||||
&& !defined(__WXX11__)
|
||||
/* for Cygwin, default to wxMSW unless otherwise specified */
|
||||
# ifndef __WXMSW__
|
||||
# define __WXMSW__
|
||||
# endif
|
||||
@ -499,7 +499,7 @@
|
||||
at least maj.min
|
||||
*/
|
||||
#if ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
|
||||
( defined( __CYGWIN__ ) && defined( __WINDOWS__ ) ) || \
|
||||
defined( __CYGWIN__ ) || \
|
||||
(defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \
|
||||
!defined(__DOS__) && \
|
||||
!defined(__WXMOTIF__) && \
|
||||
|
Loading…
Reference in New Issue
Block a user