Allow building wxGTK using GTK+3 under Windows too.
No real changes, just use the right libraries for GTK+3 port. Closes #15871. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -608,6 +608,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
|
||||
|
||||
<set var="LIB_GTK">
|
||||
<if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1' and TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib glib-2.0.lib</if>
|
||||
<if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1' and TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">libgtk-3.dll.a libgdk-3.dll.a pangocairo-1.0.lib gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib glib-2.0.lib</if>
|
||||
</set>
|
||||
|
||||
<!-- for GUI libs/samples: -->
|
||||
|
@@ -19,6 +19,10 @@ All (GUI):
|
||||
- Add wxHtmlWindow::SetDefaultHTMLCursor() (Jeff A. Marr).
|
||||
- Add default ctor and Create() to wxContextHelpButton (Hanmac).
|
||||
|
||||
wxGTK:
|
||||
|
||||
- Support building wxGTK3 under Windows (Kolya Kosenko).
|
||||
|
||||
wxMSW:
|
||||
|
||||
- Make wxFILTER_INCLUDE_LIST in wxTextValidator actually usable.
|
||||
|
@@ -243,8 +243,13 @@
|
||||
#endif
|
||||
|
||||
#ifdef __WXGTK__
|
||||
#ifdef __WXGTK3__
|
||||
#pragma comment(lib, "libgtk-3.dll.a")
|
||||
#pragma comment(lib, "libgdk-3.dll.a")
|
||||
#else
|
||||
#pragma comment(lib, "gtk-win32-2.0.lib")
|
||||
#pragma comment(lib, "gdk-win32-2.0.lib")
|
||||
#endif
|
||||
#pragma comment(lib, "pangocairo-1.0.lib")
|
||||
#pragma comment(lib, "gdk_pixbuf-2.0.lib")
|
||||
#pragma comment(lib, "cairo.lib")
|
||||
|
Reference in New Issue
Block a user