mirror of
https://gitlab.gnome.org/GNOME/glade.git
synced 2025-12-24 00:04:49 -05:00
build: Do not use a system variable only for Windows
Glade is built in multiple systems and `Windows` is not the only system that needs specific commands. Change the `glade_windows` variable to hold the system value.
This commit is contained in:
parent
27c2286bd9
commit
85c40c1510
@ -176,7 +176,7 @@ if enable_mac_integration
|
||||
endif
|
||||
endif
|
||||
|
||||
if glade_windows
|
||||
if glade_system == 'windows'
|
||||
rc = configure_file(
|
||||
input: 'glade.rc.in',
|
||||
output: '@BASELINE@',
|
||||
@ -255,7 +255,7 @@ sources = files(
|
||||
)
|
||||
|
||||
ldflags = []
|
||||
if glade_windows
|
||||
if glade_system == 'windows'
|
||||
rc = configure_file(
|
||||
input: 'glade-previewer.rc.in',
|
||||
output: '@BASELINE@',
|
||||
|
||||
@ -40,7 +40,7 @@ gladeui_age = 5
|
||||
gladeui_current_minus_age = gladeui_current - gladeui_age
|
||||
gladeui_libversion = '@0@.@1@.@2@'.format(gladeui_current_minus_age, gladeui_age, gladeui_revision)
|
||||
|
||||
glade_windows = host_machine.system() == 'windows'
|
||||
glade_system = host_machine.system()
|
||||
glade_debug = get_option('buildtype').contains('debug')
|
||||
|
||||
glade_unstable = glade_minor_version.is_odd()
|
||||
@ -151,7 +151,7 @@ if enable_mac_integration
|
||||
endif
|
||||
endif
|
||||
|
||||
if glade_windows
|
||||
if glade_system == 'windows'
|
||||
rc_conf = configuration_data()
|
||||
rc_conf.set('GLADE_MAJOR_VERSION', glade_major_version)
|
||||
rc_conf.set('GLADE_MINOR_VERSION', glade_minor_version)
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
ldflags = []
|
||||
if glade_windows
|
||||
if glade_system == 'windows'
|
||||
ldflags += cc.get_supported_link_arguments('-no-undefined')
|
||||
endif
|
||||
|
||||
|
||||
@ -32,7 +32,7 @@ deps = [
|
||||
]
|
||||
|
||||
ldflags = []
|
||||
if glade_windows
|
||||
if glade_system == 'windows'
|
||||
rc = configure_file(
|
||||
input: 'glade.rc.in',
|
||||
output: '@BASELINE@',
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user