Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow building wxGTK under Windows with MSVC.

Browse Source 
Replace a few more __WXMSW__ tests with __WINDOWS__ ones and modify bakefiles
to allow specifying the toolkit to be built in wxMSW makefiles.

Closes #13902.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-12-28 16:03:03 +00:00
parent 91270d2d17
commit d48f13a168
59 changed files with 114959 additions and 36027 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/chkconf.h
View File

@@ -1211,8 +1211,11 @@
#if defined(__WXWINCE__)
# include "wx/msw/wince/chkconf.h"
#elif defined(__WXMSW__)
#elif defined(__WINDOWS__)
# include "wx/msw/chkconf.h"
# if defined(__WXGTK__)
# include "wx/gtk/chkconf.h"
# endif
#elif defined(__WXGTK__)
# include "wx/gtk/chkconf.h"
#elif defined(__WXCOCOA__)
@@ -1233,9 +1236,9 @@
/*
__UNIX__ is also defined under Cygwin but we shouldn't perform these checks
there if we're building wxMSW.
there if we're building Windows ports.
*/
#if defined(__UNIX__) && !defined(__WXMSW__)
#if defined(__UNIX__) && !defined(__WINDOWS__)
# include "wx/unix/chkconf.h"
#endif