summaryrefslogtreecommitdiff
path: root/src/generic
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-10-18 18:38:16 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-10-18 18:38:58 +0100
commita6b9a05007942e05ba52b8488e9a278d5dc8ac5b (patch)
treee0f0598dc146607623a0f10a6aa302b32cc5f2b8 /src/generic
parent52e0b8440b552562a1bde01ee960069e6353a62a (diff)
build - meson - fix install of generic loaders for evas to be exes
they were shared libs..... oops. :)
Diffstat (limited to 'src/generic')
-rw-r--r--src/generic/evas/meson.build13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/generic/evas/meson.build b/src/generic/evas/meson.build
index 80a679b230..a6c924f90e 100644
--- a/src/generic/evas/meson.build
+++ b/src/generic/evas/meson.build
@@ -15,6 +15,11 @@ common = static_library('evas_loader_common',
15 dependencies: [generic_deps, rt], 15 dependencies: [generic_deps, rt],
16) 16)
17 17
18bin_ext=''
19if sys_exe_extension == ''
20 bin_ext='.'+sys_exe_extension
21endif
22
18foreach loader : generic_loaders 23foreach loader : generic_loaders
19 generic_src = [] 24 generic_src = []
20 generic_deps = [] 25 generic_deps = []
@@ -23,19 +28,17 @@ foreach loader : generic_loaders
23 if get_option('evas-loaders-disabler').contains(loader) == false 28 if get_option('evas-loaders-disabler').contains(loader) == false
24 subdir(loader) 29 subdir(loader)
25 30
26 tmp = shared_module('image_loader.'+loader, 31 tmp = executable('evas_image_loader.'+loader,
27 generic_src, 32 generic_src,
28 include_directories : config_dir + [include_directories('common')], 33 include_directories : config_dir + [include_directories('common')],
29 link_with : common, 34 link_with : common,
30 dependencies: [eina, generic_deps], 35 dependencies: [eina, generic_deps],
31 name_prefix : 'evas_',
32 install_dir : join_paths(dir_lib, 'evas', 'utils'), 36 install_dir : join_paths(dir_lib, 'evas', 'utils'),
33 install : true, 37 install : true,
34 ) 38 )
35 39
36 set_variable(loader, tmp) 40 bin = join_paths(dir_lib, 'evas', 'utils', 'evas_image_loader.'+loader+bin_ext)
37 mod = join_paths(dir_lib, 'evas', 'utils', 'evas_image_loader.'+loader+'.'+sys_mod_extension) 41 evas_loader_map += [[bin, generic_support]]
38 evas_loader_map += [[mod, generic_support]]
39 else 42 else
40 message('Image loader '+loader+' disabled') 43 message('Image loader '+loader+' disabled')
41 endif 44 endif