[gimp/meson: 108/127] Remove redundant os_win32 and platform_win32 variables

[Félix Piédallu <fpiedallu src gnome org>]

commit acb6169c5578e1aeb5651354052cfa8ddf435907
Author: Félix Piédallu <felix piedallu me>
Date:   Mon Jan 15 10:11:38 2018 +0100

    Remove redundant os_win32 and platform_win32 variables

 app/meson.build                        |    2 +-
 libgimp/meson.build                    |    4 ++--
 libgimpbase/meson.build                |    2 +-
 libgimpcolor/meson.build               |    2 +-
 libgimpconfig/meson.build              |    2 +-
 libgimpmath/meson.build                |    2 +-
 libgimpmodule/meson.build              |    2 +-
 libgimpthumb/meson.build               |    2 +-
 libgimpwidgets/meson.build             |    2 +-
 meson.build                            |   22 ++++++++++------------
 modules/meson.build                    |    2 +-
 plug-ins/meson.build                   |    2 +-
 plug-ins/selection-to-path/meson.build |    2 +-
 tools/meson.build                      |    2 +-
 14 files changed, 24 insertions(+), 26 deletions(-)
---
diff --git a/app/meson.build b/app/meson.build
index cfc1d1f..9977b6e 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -79,7 +79,7 @@ if platform_osx
   app_lflags += ['-framework', 'Cocoa']
 endif
 
-if os_win32
+if platform_win32
   app_lflags += [ '-mwindows', '-mexchndl', ]
   # app_lflags += ['-export-symbols', 'gimpwidgets.def']
 endif
diff --git a/libgimp/meson.build b/libgimp/meson.build
index 9555544..769a3c5 100644
--- a/libgimp/meson.build
+++ b/libgimp/meson.build
@@ -278,7 +278,7 @@ libgimp_top_lflags = [
   libgimpconfig,
 ]
 
-if os_win32
+if platform_win32
   libgimp_top_lflags += ['-export-symbols', 'gimp.def']
   libgimp_top_lflags += '-lexchndl'
 endif
@@ -307,7 +307,7 @@ libgimpui_lflags = [
   libgimpwidgets,
 ]
 
-if os_win32
+if platform_win32
   libgimpui_lflags += ['-export-symbols', 'gimpui.def']
   libgimpui_lflags += '-lexchndl'
 endif
diff --git a/libgimpbase/meson.build b/libgimpbase/meson.build
index 597948b..15be88e 100644
--- a/libgimpbase/meson.build
+++ b/libgimpbase/meson.build
@@ -93,7 +93,7 @@ libgimpbase_cflags = [
 ]
 libgimpbase_lflags = [ ]
 
-if os_win32
+if platform_win32
   libgimpbase_lflags += '-lole32'
   libgimpbase_lflags += ['-export-symbols', 'gimpbase.def']
 endif
diff --git a/libgimpcolor/meson.build b/libgimpcolor/meson.build
index a663030..fd6d3b2 100644
--- a/libgimpcolor/meson.build
+++ b/libgimpcolor/meson.build
@@ -39,7 +39,7 @@ libgimpcolor_lflags = [
   libgimpbase,
 ]
 
-if os_win32
+if platform_win32
   libgimpcolor_lflags += '-lole32'
   libgimpcolor_lflags += ['-export-symbols', 'gimpcolor.def']
 endif
diff --git a/libgimpconfig/meson.build b/libgimpconfig/meson.build
index c3d9306..618d7cb 100644
--- a/libgimpconfig/meson.build
+++ b/libgimpconfig/meson.build
@@ -56,7 +56,7 @@ libgimpconfig_lflags = [
   libgimpmath,
 ]
 
-if os_win32
+if platform_win32
   libgimpconfig_lflags += ['-export-symbols', 'gimpconfig.def']
 endif
 
diff --git a/libgimpmath/meson.build b/libgimpmath/meson.build
index d172324..042278d 100644
--- a/libgimpmath/meson.build
+++ b/libgimpmath/meson.build
@@ -23,7 +23,7 @@ libgimpmath_lflags = [
   libgimpbase,
 ]
 
-if os_win32
+if platform_win32
   libgimpmath_lflags += ['-export-symbols', 'gimpmath.def']
 endif
 
diff --git a/libgimpmodule/meson.build b/libgimpmodule/meson.build
index c94a311..6c9f8e2 100644
--- a/libgimpmodule/meson.build
+++ b/libgimpmodule/meson.build
@@ -20,7 +20,7 @@ libgimpmodule_lflags = [
   libgimpconfig,
 ]
 
-if os_win32
+if platform_win32
   libgimpmodule_lflags += ['-export-symbols', 'gimpmodule.def']
 endif
 
diff --git a/libgimpthumb/meson.build b/libgimpthumb/meson.build
index 7f5a027..d7fb7c5 100644
--- a/libgimpthumb/meson.build
+++ b/libgimpthumb/meson.build
@@ -55,7 +55,7 @@ libgimpthumb_lflags = [
   libgimpbase,
 ]
 
-if os_win32
+if platform_win32
   libgimpthumb_lflags += ['-export-symbols', 'gimpthumb.def']
 endif
 
diff --git a/libgimpwidgets/meson.build b/libgimpwidgets/meson.build
index 4b17e91..05f61a4 100644
--- a/libgimpwidgets/meson.build
+++ b/libgimpwidgets/meson.build
@@ -164,7 +164,7 @@ libgimpwidgets_lflags = [
   libgimpconfig,
 ]
 
-if os_win32
+if platform_win32
   libgimpwidgets_lflags += ['-export-symbols', 'gimpwidgets.def']
   libgimpwidgets_lflags += '-lgdi32'
 endif
diff --git a/meson.build b/meson.build
index a908b36..37f951f 100644
--- a/meson.build
+++ b/meson.build
@@ -97,14 +97,12 @@ endif
 host_os = host_machine.system().to_lower()
 message('Host os: ' + host_os)
 
-platform_win32 = (host_os.startswith('mingw') or host_os.startswith('cygwin'))
-# Is this native win32
-os_win32 = host_os.startswith('mingw') or host_os.contains('windows')
+platform_win32= host_os.contains('mingw') or host_os.contains('cygwin') or host_os.contains('windows')
+platform_osx  = host_os.contains('darwin')
 
-platform_osx = host_os.startswith('darwin')
 conf.set('PLATFORM_OSX',  platform_osx)
 
-if os_win32
+if platform_win32
   windows = import('windows')
 endif
 
@@ -122,8 +120,8 @@ cairo             = dependency('cairo',              version: cairo_minver)
 
 dbus_glib         = dependency('dbus-glib-1')
 
-fontconfig_minver = os_win32 ? '>=2.11.1'         : '>=2.2.0'
-fontconfig_name   = os_win32 ? 'fontconfig_win32' : 'fontconfig'
+fontconfig_minver = platform_win32 ? '>=2.11.1'         : '>=2.2.0'
+fontconfig_name   = platform_win32 ? 'fontconfig_win32' : 'fontconfig'
 fontconfig        = dependency(fontconfig_name,      version: fontconfig_minver)
 
 freetype2         = dependency('freetype2',          version: '>=2.1.7')
@@ -137,7 +135,7 @@ gegl              = dependency('gegl-0.3',           version: gegl_minver)
 gexiv2            = dependency('gexiv2',             version: '>=0.10.6')
 
 gio               = dependency('gio-2.0')
-gio_specific_name = os_win32 ? 'gio-windows-2.0' : 'gio-unix-2.0'
+gio_specific_name = platform_win32 ? 'gio-windows-2.0' : 'gio-unix-2.0'
 gio_specific      = dependency(gio_specific_name)
 
 glib              = dependency('glib-2.0',           version: '>=2.54.2')
@@ -242,7 +240,7 @@ cc.has_argument('-maltivec')
 cc.has_argument('-mabi=altivec')
 
 
-if os_win32
+if platform_win32
   ole32 = cc.find_library('ole32')
 endif
 
@@ -469,7 +467,7 @@ endif
 # DirectX DirectInput
 have_directXinput = false
 directx_sdk_path = get_option('with-directx-sdk')
-if directx_sdk_path != '' and os_win32
+if directx_sdk_path != '' and platform_win32
   if directx_sdk_path.contains(' ')
     message('Warning: The DirectX SDK should be accessible through a path without spaces. Use MSYS mounts.'
         + '\nIgnoring your with-directx-sdk switch.'
@@ -740,7 +738,7 @@ add_project_arguments(
 
 # Ensure MSVC-compatible struct packing convention is used when
 # compiling for Win32 with gcc.
-if os_win32
+if platform_win32
   add_project_arguments(
     cc.first_supported_argument('-fnative-struct', '-mms-bitfields')
        )
@@ -936,7 +934,7 @@ Optional Plug-Ins:
   Print:               @0@'''.format(have_print) +'''
   Python 2:            @0@'''.format(have_python) +'''
   Script-Fu:           @0@'''.format(have_scriptfu) +'''
-  TWAIN (Win32):       @0@'''.format(os_win32) +'''
+  TWAIN (Win32):       @0@'''.format(platform_win32) +'''
   Webpage:             @0@'''.format(webkit.found()) +'''
   WMF:                 @0@'''.format(wmf.found()) +'''
   X11 Mouse Cursor:    @0@'''.format(xmc.found()) +'''
diff --git a/modules/meson.build b/modules/meson.build
index 83259d6..6f3f5f0 100644
--- a/modules/meson.build
+++ b/modules/meson.build
@@ -14,7 +14,7 @@ if platform_osx
   global_lflags += ['-framework', 'Cocoa']
 endif
 
-if os_win32
+if platform_win32
   # global_lflags += ['-export-symbols', 'gimpmath.def']
 endif
 
diff --git a/plug-ins/meson.build b/plug-ins/meson.build
index 0aa86c9..2bdc904 100644
--- a/plug-ins/meson.build
+++ b/plug-ins/meson.build
@@ -41,7 +41,7 @@ if have_scriptfu
   subdir('script-fu')
 endif
 subdir('selection-to-path')
-if os_win32
+if platform_win32
   subdir('twain')
 endif
 subdir('ui')
diff --git a/plug-ins/selection-to-path/meson.build b/plug-ins/selection-to-path/meson.build
index 451330e..67e6ba1 100644
--- a/plug-ins/selection-to-path/meson.build
+++ b/plug-ins/selection-to-path/meson.build
@@ -23,7 +23,7 @@ plugin_selection_to_path_deps = [
   gegl, gtk2,
 ]
 plugin_selection_to_path_lflags = []
-if os_win32
+if platform_win32
   plugin_selection_to_path_lflags += '-mwindows'
 else
   plugin_selection_to_path_deps += math
diff --git a/tools/meson.build b/tools/meson.build
index fe91cde..76b42cd 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -1,5 +1,5 @@
 
-if os_win32
+if platform_win32
   gimp_debug_resume = executable('gimp-debug-resume', 'gimp-debug-resume.c')
 endif