diff --git a/build/win32/gtkpc.py b/build/win32/gtkpc.py index 97a33c08b0..d5d7747fc2 100644 --- a/build/win32/gtkpc.py +++ b/build/win32/gtkpc.py @@ -30,7 +30,7 @@ def main(argv): atk_min_ver = '2.15.1' cairo_min_ver = '1.14.0' gdk_pixbuf_min_ver = '2.30.0' - gdk_win32_sys_libs = '-lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid -lwinmm -ldwmapi' + gdk_win32_sys_libs = '-lgdi32 -limm32 -lshell32 -lole32 -lwinmm -ldwmapi' glib_min_ver = '2.45.8' cairo_backends = 'cairo-win32' @@ -41,14 +41,14 @@ def main(argv): gdk_args = gdk_parser.parse_args() if getattr(gdk_args, 'broadway', None) is 1: # On Visual Studio, we link to zlib1.lib - broadway_extra_libs = '-lzlib1' + broadway_extra_libs = ' -lzlib1' gdk_backends += ' broadway' cairo_backends += ' cairo' pkg_replace_items = {'@GTK_API_VERSION@': '3.0', '@GDK_BACKENDS@': gdk_backends} - pkg_required_packages = 'gdk-pixbuf >= ' + gdk_pixbuf_min_ver + ' ' + \ + pkg_required_packages = 'gdk-pixbuf-2.0 >= ' + gdk_pixbuf_min_ver + ' ' + \ 'cairo >= ' + cairo_min_ver + ' ' + \ 'cairo-gobject >= ' + cairo_min_ver diff --git a/build/win32/vs10/gtk3-install.propsin b/build/win32/vs10/gtk3-install.propsin index 5c421c47b8..57625fb44d 100644 --- a/build/win32/vs10/gtk3-install.propsin +++ b/build/win32/vs10/gtk3-install.propsin @@ -92,7 +92,9 @@ copy .\Debug\$(Platform)\bin\gtk-builder-tool.pdb $(CopyDir)\bin :DONE_BIN copy ..\gdk-3.0.pc $(CopyDir)\lib\pkgconfig +copy ..\gdk-3.0.pc $(CopyDir)\lib\pkgconfig\gdk-win32-3.0.pc copy "..\gtk+-3.0.pc" $(CopyDir)\lib\pkgconfig +copy "..\gtk+-3.0.pc" "$(CopyDir)\lib\pkgconfig\gtk+-3.0.pc" copy ..\gail-3.0.pc $(CopyDir)\lib\pkgconfig diff --git a/build/win32/vs9/gtk3-install.vspropsin b/build/win32/vs9/gtk3-install.vspropsin index e665d1342c..64b33b4040 100644 --- a/build/win32/vs9/gtk3-install.vspropsin +++ b/build/win32/vs9/gtk3-install.vspropsin @@ -92,7 +92,9 @@ copy .\Debug\$(PlatformName)\bin\gtk-builder-tool.pdb $(CopyDir)\bin :DONE_BIN copy ..\gdk-3.0.pc $(CopyDir)\lib\pkgconfig +copy ..\gdk-3.0.pc $(CopyDir)\lib\pkgconfig\gdk-win32-3.0.pc copy "..\gtk+-3.0.pc" $(CopyDir)\lib\pkgconfig +copy "..\gtk+-3.0.pc" "$(CopyDir)\lib\pkgconfig\gtk+-win32-3.0.pc" copy ..\gail-3.0.pc $(CopyDir)\lib\pkgconfig " />