This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch dev/dimmus/test
in repository efl.
View the commit online.
commit 7dac6faeecad5d6d7a7f1cba4dec5ec551681196
Author: dimmus <dmitri.chudi...@gmail.com>
AuthorDate: Mon Oct 21 09:03:32 2024 +0500
meson: change sys_windows to WINDOWS
---
meson/header_checks/meson.build | 4 ++--
src/bin/edje/meson.build | 2 +-
src/bin/elementary/meson.build | 8 ++++----
src/bindings/mono/efl_mono/meson.build | 2 +-
src/lib/ecore/meson.build | 4 ++--
src/lib/ecore_audio/meson.build | 2 +-
src/lib/ecore_con/meson.build | 6 +++---
src/lib/ecore_file/meson.build | 2 +-
src/lib/ecore_win32/meson.build | 2 +-
src/lib/efreet/meson.build | 2 +-
src/lib/eina/meson.build | 6 +++---
src/lib/eio/meson.build | 2 +-
src/lib/elementary/meson.build | 4 ++--
src/lib/evas/meson.build | 2 +-
src/modules/ecore/meson.build | 2 +-
src/modules/ecore_evas/meson.build | 2 +-
src/modules/evas/engines/meson.build | 2 +-
17 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/meson/header_checks/meson.build b/meson/header_checks/meson.build
index c8042f0ff8..d826460e78 100644
--- a/meson/header_checks/meson.build
+++ b/meson/header_checks/meson.build
@@ -214,7 +214,7 @@ if sys_linux and config_h.has('HAVE_LISTXATTR') and config_h.has('HAVE_SETXATTR'
endif
regexp = []
-if sys_windows
+if WINDOWS
regexp = cc.find_library('regex',
has_headers: ['regex.h'],
required: true)
@@ -249,7 +249,7 @@ endif
config_h.set('SIZEOF_INT', cc.sizeof('int'))
config_h.set('SIZEOF_LONG', cc.sizeof('long'))
-if sys_windows
+if WINDOWS
config_h.set('HAVE_NOTIFY_WIN32', '1')
config_h.set10('HAVE_DDRAW_H', true)
endif
diff --git a/src/bin/edje/meson.build b/src/bin/edje/meson.build
index 9bc30b35bf..9a70649c21 100644
--- a/src/bin/edje/meson.build
+++ b/src/bin/edje/meson.build
@@ -42,7 +42,7 @@ if meson.is_cross_build()
edje_cc_exe = [_edje_cc]
edje_depends = []
else
- if sys_windows
+ if WINDOWS
edje_cc_exe = [edje_cc]
else
edje_cc_exe = [env, asan_option, 'EFL_RUN_IN_TREE=1', edje_cc]
diff --git a/src/bin/elementary/meson.build b/src/bin/elementary/meson.build
index c8e27041a6..d2aeb92a17 100644
--- a/src/bin/elementary/meson.build
+++ b/src/bin/elementary/meson.build
@@ -167,11 +167,11 @@ elementary_test_src = [
]
link_args = []
-if not sys_windows
+if not WINDOWS
link_args += ['-rdynamic', '-fPIC']
package_c_args = package_c_args + ['-fPIC']
endif
-if not sys_windows and not sys_sun
+if not WINDOWS and not sys_sun
link_args += ['-pie']
endif
@@ -199,7 +199,7 @@ elementary_config = executable('elementary_config',
link_args: link_args
)
-if not sys_windows
+if not WINDOWS
elementary_quicklaunch_src = [
'quicklaunch.c'
]
@@ -261,7 +261,7 @@ else
elm_prefs_cc_exe = [env, asan_option, 'EFL_RUN_IN_TREE=1', elm_prefs_cc.full_path()]
endif
-if not sys_windows
+if not WINDOWS
elementary_run_src = [
'run.c'
]
diff --git a/src/bindings/mono/efl_mono/meson.build b/src/bindings/mono/efl_mono/meson.build
index 7569426aa5..0ea0a9cfbf 100644
--- a/src/bindings/mono/efl_mono/meson.build
+++ b/src/bindings/mono/efl_mono/meson.build
@@ -18,7 +18,7 @@ efl_libs.set('EVIL_DL_MONO', 'dl')
if sys_osx
efl_libs.set('LIBDL_DL_MONO', 'dl.dylib')
efl_libs.set('CUSTOM_EXPORTS_MONO_DL_MONO', 'eflcustomexportsmono')
-elif sys_windows
+elif WINDOWS
efl_libs.set('LIBDL_DL_MONO', 'libdl.dll')
efl_libs.set('CUSTOM_EXPORTS_MONO_DL_MONO', 'libeflcustomexportsmono' + '-' + version_major)
else
diff --git a/src/lib/ecore/meson.build b/src/lib/ecore/meson.build
index fb2a2a331b..c5c7acf73e 100644
--- a/src/lib/ecore/meson.build
+++ b/src/lib/ecore/meson.build
@@ -175,14 +175,14 @@ ecore_src = files(
'efl_core_command_line.c',
)
-if sys_windows
+if WINDOWS
#nothing for now ... needs testing
ecore_src += files('ecore_exe_win32.c')
else
ecore_src += files('ecore_signal.c', 'ecore_exe_posix.c')
endif
-if get_option('glib') and not sys_windows
+if get_option('glib') and not WINDOWS
ecore_ext_deps += dependency('glib-2.0')
ecore_ext_deps += dependency('gthread-2.0')
config_h.set('GLIB_INTEGRATION_ALWAYS', '1')
diff --git a/src/lib/ecore_audio/meson.build b/src/lib/ecore_audio/meson.build
index db97b41761..842082a0d4 100644
--- a/src/lib/ecore_audio/meson.build
+++ b/src/lib/ecore_audio/meson.build
@@ -72,7 +72,7 @@ if get_option('pulseaudio')
config_h.set('HAVE_PULSE', '1')
endif
-if sys_windows
+if WINDOWS
ecore_audio_src += files(
'ecore_audio_obj_out_wasapi.c'
)
diff --git a/src/lib/ecore_con/meson.build b/src/lib/ecore_con/meson.build
index 897029b5b6..61781503fd 100644
--- a/src/lib/ecore_con/meson.build
+++ b/src/lib/ecore_con/meson.build
@@ -1,7 +1,7 @@
ecore_con_deps = [buildsystem, eldbus, eet]
ecore_con_pub_deps = [eina, eo, efl, ecore]
ecore_con_ext_deps = [buildsystem_simple, dl, http_parser]
-if sys_windows
+if WINDOWS
ipv6 = true
else
ipv6 = cc.compiles('''
@@ -45,7 +45,7 @@ pub_eo_files = [
'efl_net_ip_address.eo',
]
-if sys_windows
+if WINDOWS
pub_eo_files += [
'efl_net_socket_windows.eo',
'efl_net_dialer_windows.eo',
@@ -150,7 +150,7 @@ ecore_con_src = files(
'efl_net_ip_address.c'
)
-if sys_windows
+if WINDOWS
ecore_con_src += files(
'efl_net_socket_windows.c',
'efl_net_dialer_windows.c',
diff --git a/src/lib/ecore_file/meson.build b/src/lib/ecore_file/meson.build
index d425d537e5..e1a984fd6a 100644
--- a/src/lib/ecore_file/meson.build
+++ b/src/lib/ecore_file/meson.build
@@ -10,7 +10,7 @@ ecore_file_src = files(
'ecore_file_private.h'
)
-if sys_windows
+if WINDOWS
ecore_file_src += files( 'ecore_file_monitor_win32.c')
elif sys_linux
ecore_file_src += files( 'ecore_file_monitor_inotify.c')
diff --git a/src/lib/ecore_win32/meson.build b/src/lib/ecore_win32/meson.build
index 271cb5a137..56a2e67fd5 100644
--- a/src/lib/ecore_win32/meson.build
+++ b/src/lib/ecore_win32/meson.build
@@ -3,7 +3,7 @@ ecore_win32_pub_deps = []
ecore_win32_ext_deps = []
ecore_win32_src = []
-if sys_windows
+if WINDOWS
ecore_win32_deps += [evil, eina, ecore, ecore_input]
ecore_win32_pub_deps += []
ecore_win32_ext_deps += []
diff --git a/src/lib/efreet/meson.build b/src/lib/efreet/meson.build
index e700e1d4b2..0bb03eb5ce 100644
--- a/src/lib/efreet/meson.build
+++ b/src/lib/efreet/meson.build
@@ -36,7 +36,7 @@ efreet_ext_deps = [buildsystem_simple, intl, m]
package_c_args += ['-DDATA_DIR="'+dir_data+'"']
-if sys_windows
+if WINDOWS
shlwapi = cc.find_library('shlwapi')
efreet_ext_deps += [shlwapi]
endif
diff --git a/src/lib/eina/meson.build b/src/lib/eina/meson.build
index bab98a5a58..64742a9ad5 100644
--- a/src/lib/eina/meson.build
+++ b/src/lib/eina/meson.build
@@ -3,7 +3,7 @@ eina_pub_deps = [thread_dep, m]
eina_pc_deps = [m, rt, dl, thread_dep] #special case, this array is taken to drag in external deps to efl-one
eina_ext_deps = eina_pc_deps
-if sys_windows
+if WINDOWS
eina_pub_deps += [evil]
endif
@@ -201,7 +201,7 @@ eina_src = files(
'eina_sha.c',
) + eina_mp_sources
-if sys_windows
+if WINDOWS
eina_src += files('eina_file_win32.c', 'eina_win32_dllmain.c', 'eina_thread_win32.c')
else
eina_src += files('eina_file_posix.c', 'eina_thread_posix.c')
@@ -370,7 +370,7 @@ execinfo = cc.find_library('execinfo', required: false)
eina_ext_deps += [execinfo]
eina_c_args = [package_c_args, '-DEINA_BUILD']
-if sys_windows
+if WINDOWS
bcrypt = cc.find_library('bcrypt', required: true)
eina_ext_deps += [bcrypt]
if iconv.found()
diff --git a/src/lib/eio/meson.build b/src/lib/eio/meson.build
index d78147d6de..0d63708e4f 100644
--- a/src/lib/eio/meson.build
+++ b/src/lib/eio/meson.build
@@ -52,7 +52,7 @@ eio_src = files(
linker_args = []
-if sys_windows
+if WINDOWS
eio_src += files('eio_monitor_win32.c')
elif sys_osx
eio_src += files('eio_monitor_cocoa.c')
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 2a19be48e9..f046ec75e8 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -961,7 +961,7 @@ config_h.set_quoted('MODULES_PATH', dir_lib / 'modules')
config_h.set_quoted('ELEMENTARY_BASE_DIR', get_option('elementary-base-dir'))
config_h.set_quoted('ICON_DIR', dir_lib / 'icons')
-if not sys_windows
+if not WINDOWS
elm_options.set('ELM_UNIX', '1')
endif
@@ -1003,7 +1003,7 @@ if get_option('cocoa')
elementary_deps += ecore_cocoa
endif
-if sys_windows
+if WINDOWS
config_h.set('HAVE_ELEMENTARY_WIN32', '1')
elementary_deps += ecore_win32
endif
diff --git a/src/lib/evas/meson.build b/src/lib/evas/meson.build
index f65c0e13ae..642fc75d44 100644
--- a/src/lib/evas/meson.build
+++ b/src/lib/evas/meson.build
@@ -208,7 +208,7 @@ if get_option('opengl') != 'none'
if get_option('opengl') == 'es-egl'
config_h.set('GL_GLES', '1')
# Angle library does not provide .pc files
- if sys_windows
+ if WINDOWS
glesv2_dep = cc.find_library(
'GLESv2',
has_headers: 'GLES2/gl2.h'
diff --git a/src/modules/ecore/meson.build b/src/modules/ecore/meson.build
index 59532317f1..7c7fe6c115 100644
--- a/src/modules/ecore/meson.build
+++ b/src/modules/ecore/meson.build
@@ -1,5 +1,5 @@
-if not sys_windows and not sys_osx
+if not WINDOWS and not sys_osx
system_modules = [
'systemd',
diff --git a/src/modules/ecore_evas/meson.build b/src/modules/ecore_evas/meson.build
index f4b48ebf67..571cd41ed6 100644
--- a/src/modules/ecore_evas/meson.build
+++ b/src/modules/ecore_evas/meson.build
@@ -7,7 +7,7 @@ engines = [
['x', ['x11']],
]
-if not sys_windows
+if not WINDOWS
engines += [['extn', []]]
else
engines += [['win32', []]]
diff --git a/src/modules/evas/engines/meson.build b/src/modules/evas/engines/meson.build
index 131bb96afe..b21b83fd72 100644
--- a/src/modules/evas/engines/meson.build
+++ b/src/modules/evas/engines/meson.build
@@ -6,7 +6,7 @@ engines = [
['wayland_shm', ['wl']],
]
-if sys_windows
+if WINDOWS
engines += [
['software_ddraw', []],
['software_gdi', []],
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
