callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Visual Studio builds: Fix .pc generation

Browse Source 
Since the Cairo build files for Visual Studio does not really generate
the pkg-config files for us, and we stopped making makeshift ones in
gobject-introspection, stop making the .pc files we generate here refer
to the Cairo .pc's, and instead make them link directly to
cairo-gobject.lib and cairo.lib.
This commit is contained in:
Chun-wei Fan 2018-03-19 16:53:57 +08:00
parent 9604eb5c53
commit 84ff404a17
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build/win32/gtkpc.py
View File

@ -31,9 +31,9 @@ def main(argv):
cairo_min_ver = '1.14.0' cairo_min_ver = '1.14.0'
gdk_pixbuf_min_ver = '2.30.0' gdk_pixbuf_min_ver = '2.30.0'
gdk_win32_sys_libs = '-lgdi32 -limm32 -lshell32 -lole32 -lwinmm -ldwmapi' gdk_win32_sys_libs = '-lgdi32 -limm32 -lshell32 -lole32 -lwinmm -ldwmapi'
cairo_libs = '-lcairo-gobject -lcairo '
glib_min_ver = '2.45.8' glib_min_ver = '2.45.8'
cairo_backends = 'cairo-win32'
gdk_backends = 'win32' gdk_backends = 'win32'
gio_package = 'gio-2.0 >= ' + glib_min_ver gio_package = 'gio-2.0 >= ' + glib_min_ver
broadway_extra_libs = '' broadway_extra_libs = ''
@ -43,20 +43,17 @@ def main(argv):
# On Visual Studio, we link to zlib1.lib # On Visual Studio, we link to zlib1.lib
broadway_extra_libs = ' -lzlib1' broadway_extra_libs = ' -lzlib1'
gdk_backends += ' broadway' gdk_backends += ' broadway'
cairo_backends += ' cairo'
pkg_replace_items = {'@GTK_API_VERSION@': '3.0', pkg_replace_items = {'@GTK_API_VERSION@': '3.0',
'@GDK_BACKENDS@': gdk_backends} '@GDK_BACKENDS@': gdk_backends}
pkg_required_packages = 'gdk-pixbuf-2.0 >= ' + gdk_pixbuf_min_ver + ' ' + \ pkg_required_packages = 'gdk-pixbuf-2.0 >= ' + gdk_pixbuf_min_ver
'cairo >= ' + cairo_min_ver + ' ' + \
'cairo-gobject >= ' + cairo_min_ver
gdk_pc_replace_items = {'@GDK_PACKAGES@': gio_package + ' ' + \ gdk_pc_replace_items = {'@GDK_PACKAGES@': gio_package + ' ' + \
'pangowin32 pangocairo' + ' ' + \ 'pangowin32 pangocairo' + ' ' + \
pkg_required_packages, pkg_required_packages,
'@GDK_PRIVATE_PACKAGES@': gio_package + ' ' + cairo_backends, '@GDK_PRIVATE_PACKAGES@': gio_package,
'@GDK_EXTRA_LIBS@': gdk_win32_sys_libs + broadway_extra_libs, '@GDK_EXTRA_LIBS@': cairo_libs + gdk_win32_sys_libs + broadway_extra_libs,
'@GDK_EXTRA_CFLAGS@': '', '@GDK_EXTRA_CFLAGS@': '',
'gdk-3': 'gdk-3.0'} 'gdk-3': 'gdk-3.0'}