bu5hm4n pushed a commit to branch feature/meson. http://git.enlightenment.org/core/efl.git/commit/?id=c8c4086322ce4cd1e3543c9f2f034b530f20b9cb
commit c8c4086322ce4cd1e3543c9f2f034b530f20b9cb Author: Marcel Hollerbach <[email protected]> Date: Wed Mar 28 10:54:06 2018 +0100 meson: carry a variable with the library extension --- meson.build | 8 ++++++++ src/modules/ecore_evas/meson.build | 2 +- src/modules/ecore_imf/meson.build | 2 +- src/modules/eeze/meson.build | 2 +- src/modules/evas/meson.build | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index fe727c528e..9fb2f4fd17 100644 --- a/meson.build +++ b/meson.build @@ -83,6 +83,14 @@ config_h.set10('EFL_HAVE_THREADS', true) config_dir = [include_directories('.')] eolian_include_directories = [] +if target_machine.system() == 'linux' or target_machine.system() == 'bsd' + sys_lib_extension = '.so' +elif target_machine.system() == 'windows' or target_machine.system() == 'cygwin' + sys_lib_extension = '.dll' +elif target_machine.system() == 'darwin' + sys_lib_extension = '.dylib' +endif + subdir('header_checks') if get_option('ecore_wl2') == true or get_option('ecore_buffer') == true diff --git a/src/modules/ecore_evas/meson.build b/src/modules/ecore_evas/meson.build index eeb0458106..17115b5080 100644 --- a/src/modules/ecore_evas/meson.build +++ b/src/modules/ecore_evas/meson.build @@ -36,6 +36,6 @@ foreach engine_conf : engines install : true, install_dir : mod_install_dir ) - module_files += join_paths(mod_install_dir, 'lib'+mod_full_name+'.so') + module_files += join_paths(mod_install_dir, 'lib'+mod_full_name+sys_lib_extension) endif endforeach \ No newline at end of file diff --git a/src/modules/ecore_imf/meson.build b/src/modules/ecore_imf/meson.build index bebe280066..1c9252ece1 100644 --- a/src/modules/ecore_imf/meson.build +++ b/src/modules/ecore_imf/meson.build @@ -23,6 +23,6 @@ foreach mod_name : mods install: true, install_dir : mod_install_dir ) - module_files += join_paths(mod_install_dir, 'lib'+mod_name+'.so') + module_files += join_paths(mod_install_dir, 'lib'+mod_name+sys_lib_extension) endforeach diff --git a/src/modules/eeze/meson.build b/src/modules/eeze/meson.build index b19b757ab5..c10194cbd5 100644 --- a/src/modules/eeze/meson.build +++ b/src/modules/eeze/meson.build @@ -13,5 +13,5 @@ foreach sensor_conf : sensors install : true, install_dir : join_paths(dir_package_modules, 'sensor', sensor, module_arch) ) - module_files += join_paths(dir_package_modules, 'sensor', sensor, module_arch, 'libeeze_' + sensor + '.so') + module_files += join_paths(dir_package_modules, 'sensor', sensor, module_arch, 'libeeze_' + sensor + sys_lib_extension) endforeach \ No newline at end of file diff --git a/src/modules/evas/meson.build b/src/modules/evas/meson.build index e22cdea386..e897608499 100644 --- a/src/modules/evas/meson.build +++ b/src/modules/evas/meson.build @@ -96,7 +96,7 @@ foreach engine_conf : engines install : true, install_dir : mod_install_dir ) - module_files += join_paths(mod_install_dir, 'lib'+mod_full_name+'.so') + module_files += join_paths(mod_install_dir, 'lib'+mod_full_name + sys_lib_extension) endif config_h.set('BUILD_ENGINE_'+engine.to_upper(), '1') endif --
