Allow building wxGTK under Windows with MSVC.
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:
@@ -87,7 +87,11 @@
|
||||
// The user can predefine a different prefix if not using the default MSW port
|
||||
// with MSVC.
|
||||
#ifndef wxTOOLKIT_PREFIX
|
||||
#define wxTOOLKIT_PREFIX msw
|
||||
#if defined(__WXGTK__)
|
||||
#define wxTOOLKIT_PREFIX gtk2
|
||||
#else
|
||||
#define wxTOOLKIT_PREFIX msw
|
||||
#endif
|
||||
#endif // wxTOOLKIT_PREFIX
|
||||
|
||||
// the real setup.h header file we need is in the build-specific directory,
|
||||
@@ -225,4 +229,16 @@
|
||||
#if wxUSE_URL_NATIVE
|
||||
#pragma comment(lib, "wininet")
|
||||
#endif
|
||||
|
||||
#ifdef __WXGTK__
|
||||
#pragma comment(lib, "gtk-win32-2.0.lib")
|
||||
#pragma comment(lib, "gdk-win32-2.0.lib")
|
||||
#pragma comment(lib, "pangocairo-1.0.lib")
|
||||
#pragma comment(lib, "gdk_pixbuf-2.0.lib")
|
||||
#pragma comment(lib, "cairo.lib")
|
||||
#pragma comment(lib, "pango-1.0.lib")
|
||||
#pragma comment(lib, "gobject-2.0.lib")
|
||||
#pragma comment(lib, "gthread-2.0.lib")
|
||||
#pragma comment(lib, "glib-2.0.lib")
|
||||
#endif
|
||||
#endif // !WXUSINGDLL
|
||||
|
Reference in New Issue
Block a user