luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-01 06:33:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

meson: fix static build under Windows

Browse Source 
Properly define GLIB/GOBJECT_STATIC_COMPILATION when static build is enabled.
Use library() instead of shared_library() to allow selecting static builds.

https://bugzilla.gnome.org/show_bug.cgi?id=784995
This commit is contained in:
Christoph Reiter
2017-07-16 16:41:02 +02:00
committed by Christoph Reiter
parent aa7c5cbdcb
commit cf93b27ceb
9 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gio/meson.build
View File

@@ -724,7 +724,7 @@ else
gio_dtrace_hdr = []
endif
libgio = shared_library('gio-2.0',
libgio = library('gio-2.0',
gioenumtypes_h, gioenumtypes_c, gnetworking_h, gio_sources,
gio_dtrace_hdr, gio_dtrace_obj,
version : library_version,

2
gio/tests/gdbus-object-manager-example/meson.build
View File

@@ -14,7 +14,7 @@ gdbus_example_objectmanager_generated = custom_target('gdbus-example-objectmanag
'--generate-docbook', 'gdbus-example-objectmanager-generated',
'@INPUT@'])
libgdbus_example_objectmanager = shared_library('libgdbus-example-objectmanager',
libgdbus_example_objectmanager = library('libgdbus-example-objectmanager',
gdbus_example_objectmanager_generated,
c_args : ['-DHAVE_CONFIG_H=1'] + gio_c_args,
dependencies : [libglib_dep, libgmodule_dep, libgobject_dep, libgio_dep],

4
gio/tests/modules/meson.build
View File

@@ -1,10 +1,10 @@
libtestmodulea = shared_library('testmodulea', 'test-module-a.c',
libtestmodulea = library('testmodulea', 'test-module-a.c',
install : false,
dependencies : [libglib_dep, libgobject_dep, libgmodule_dep, libgio_dep],
c_args : [ ]
)
libtestmoduleb = shared_library('testmoduleb', 'test-module-b.c',
libtestmoduleb = library('testmoduleb', 'test-module-b.c',
install : false,
dependencies : [libglib_dep, libgobject_dep, libgmodule_dep, libgio_dep],
c_args : [ ]