[glade/wip/tingping/dylibs-osx: 1/2] build: Do not use a system variable only for Windows



commit 40e3c82b88318e0147cc5dbd450a9cb6189fff49
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Mon Jul 1 15:00:40 2019 +0200

    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.

 gladeui/meson.build | 4 ++--
 meson.build         | 4 ++--
 plugins/meson.build | 2 +-
 src/meson.build     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/gladeui/meson.build b/gladeui/meson.build
index f0f5bc50..309bc57d 100644
--- a/gladeui/meson.build
+++ b/gladeui/meson.build
@@ -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@',
diff --git a/meson.build b/meson.build
index 86786cbc..bb7ce01c 100644
--- a/meson.build
+++ b/meson.build
@@ -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)
diff --git a/plugins/meson.build b/plugins/meson.build
index c2d1328c..1a7a47eb 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -1,5 +1,5 @@
 ldflags = []
-if glade_windows
+if glade_system == 'windows'
   ldflags += cc.get_supported_link_arguments('-no-undefined')
 endif
 
diff --git a/src/meson.build b/src/meson.build
index 28e8fd97..0e4679aa 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -32,7 +32,7 @@ deps = [
 ]
 
 ldflags = []
-if glade_windows
+if glade_system == 'windows'
   rc = configure_file(
     input: 'glade.rc.in',
     output: '@BASELINE@',


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]