mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-04-22 23:29:16 +02:00
meson: fix static build under Windows
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:
parent
aa7c5cbdcb
commit
cf93b27ceb
@ -724,7 +724,7 @@ else
|
|||||||
gio_dtrace_hdr = []
|
gio_dtrace_hdr = []
|
||||||
endif
|
endif
|
||||||
|
|
||||||
libgio = shared_library('gio-2.0',
|
libgio = library('gio-2.0',
|
||||||
gioenumtypes_h, gioenumtypes_c, gnetworking_h, gio_sources,
|
gioenumtypes_h, gioenumtypes_c, gnetworking_h, gio_sources,
|
||||||
gio_dtrace_hdr, gio_dtrace_obj,
|
gio_dtrace_hdr, gio_dtrace_obj,
|
||||||
version : library_version,
|
version : library_version,
|
||||||
|
@ -14,7 +14,7 @@ gdbus_example_objectmanager_generated = custom_target('gdbus-example-objectmanag
|
|||||||
'--generate-docbook', 'gdbus-example-objectmanager-generated',
|
'--generate-docbook', 'gdbus-example-objectmanager-generated',
|
||||||
'@INPUT@'])
|
'@INPUT@'])
|
||||||
|
|
||||||
libgdbus_example_objectmanager = shared_library('libgdbus-example-objectmanager',
|
libgdbus_example_objectmanager = library('libgdbus-example-objectmanager',
|
||||||
gdbus_example_objectmanager_generated,
|
gdbus_example_objectmanager_generated,
|
||||||
c_args : ['-DHAVE_CONFIG_H=1'] + gio_c_args,
|
c_args : ['-DHAVE_CONFIG_H=1'] + gio_c_args,
|
||||||
dependencies : [libglib_dep, libgmodule_dep, libgobject_dep, libgio_dep],
|
dependencies : [libglib_dep, libgmodule_dep, libgobject_dep, libgio_dep],
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
libtestmodulea = shared_library('testmodulea', 'test-module-a.c',
|
libtestmodulea = library('testmodulea', 'test-module-a.c',
|
||||||
install : false,
|
install : false,
|
||||||
dependencies : [libglib_dep, libgobject_dep, libgmodule_dep, libgio_dep],
|
dependencies : [libglib_dep, libgobject_dep, libgmodule_dep, libgio_dep],
|
||||||
c_args : [ ]
|
c_args : [ ]
|
||||||
)
|
)
|
||||||
|
|
||||||
libtestmoduleb = shared_library('testmoduleb', 'test-module-b.c',
|
libtestmoduleb = library('testmoduleb', 'test-module-b.c',
|
||||||
install : false,
|
install : false,
|
||||||
dependencies : [libglib_dep, libgobject_dep, libgmodule_dep, libgio_dep],
|
dependencies : [libglib_dep, libgobject_dep, libgmodule_dep, libgio_dep],
|
||||||
c_args : [ ]
|
c_args : [ ]
|
||||||
|
@ -18,6 +18,9 @@
|
|||||||
*/
|
*/
|
||||||
#mesondefine GLIB_USING_SYSTEM_PRINTF
|
#mesondefine GLIB_USING_SYSTEM_PRINTF
|
||||||
|
|
||||||
|
#mesondefine GLIB_STATIC_COMPILATION
|
||||||
|
#mesondefine GOBJECT_STATIC_COMPILATION
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
G_BEGIN_DECLS
|
||||||
|
|
||||||
#define G_MINFLOAT FLT_MIN
|
#define G_MINFLOAT FLT_MIN
|
||||||
@ -115,7 +118,6 @@ typedef unsigned @glib_intptr_type_define@ guintptr;
|
|||||||
#define GLIB_MICRO_VERSION @GLIB_MICRO_VERSION@
|
#define GLIB_MICRO_VERSION @GLIB_MICRO_VERSION@
|
||||||
|
|
||||||
@glib_os@
|
@glib_os@
|
||||||
@glib_static_compilation@
|
|
||||||
|
|
||||||
@glib_vacopy@
|
@glib_vacopy@
|
||||||
|
|
||||||
|
@ -227,7 +227,7 @@ if use_pcre_static_flag
|
|||||||
pcre_static_args = ['-DPCRE_STATIC']
|
pcre_static_args = ['-DPCRE_STATIC']
|
||||||
endif
|
endif
|
||||||
|
|
||||||
libglib = shared_library('glib-2.0',
|
libglib = library('glib-2.0',
|
||||||
glib_dtrace_obj, glib_dtrace_hdr,
|
glib_dtrace_obj, glib_dtrace_hdr,
|
||||||
sources : [deprecated_sources, glib_sources],
|
sources : [deprecated_sources, glib_sources],
|
||||||
version : library_version,
|
version : library_version,
|
||||||
|
@ -95,7 +95,7 @@ if host_system == 'windows'
|
|||||||
gmodule_sources += [gmodule_win_res]
|
gmodule_sources += [gmodule_win_res]
|
||||||
endif
|
endif
|
||||||
|
|
||||||
libgmodule = shared_library('gmodule-2.0',
|
libgmodule = library('gmodule-2.0',
|
||||||
sources : gmodule_sources,
|
sources : gmodule_sources,
|
||||||
version : library_version,
|
version : library_version,
|
||||||
soversion : soversion,
|
soversion : soversion,
|
||||||
|
@ -61,7 +61,7 @@ else
|
|||||||
gobject_dtrace_hdr = []
|
gobject_dtrace_hdr = []
|
||||||
endif
|
endif
|
||||||
|
|
||||||
libgobject = shared_library('gobject-2.0',
|
libgobject = library('gobject-2.0',
|
||||||
gobject_dtrace_obj, gobject_dtrace_hdr,
|
gobject_dtrace_obj, gobject_dtrace_hdr,
|
||||||
sources : gobject_sources,
|
sources : gobject_sources,
|
||||||
version : library_version,
|
version : library_version,
|
||||||
|
@ -12,7 +12,7 @@ if host_system == 'windows'
|
|||||||
gthread_sources += [gthread_win_res]
|
gthread_sources += [gthread_win_res]
|
||||||
endif
|
endif
|
||||||
|
|
||||||
libgthread = shared_library('gthread-2.0',
|
libgthread = library('gthread-2.0',
|
||||||
sources : gthread_sources,
|
sources : gthread_sources,
|
||||||
version : library_version,
|
version : library_version,
|
||||||
soversion : soversion,
|
soversion : soversion,
|
||||||
|
@ -123,6 +123,11 @@ if get_option('default_library') != 'static'
|
|||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if host_system == 'windows' and get_option('default_library') == 'static'
|
||||||
|
glibconfig_conf.set('GLIB_STATIC_COMPILATION', '1')
|
||||||
|
glibconfig_conf.set('GOBJECT_STATIC_COMPILATION', '1')
|
||||||
|
endif
|
||||||
|
|
||||||
# FIXME: what about Cygwin (G_WITH_CYGWIN)
|
# FIXME: what about Cygwin (G_WITH_CYGWIN)
|
||||||
if host_system == 'windows'
|
if host_system == 'windows'
|
||||||
glib_os = '''#define G_OS_WIN32
|
glib_os = '''#define G_OS_WIN32
|
||||||
|
Loading…
x
Reference in New Issue
Block a user