summaryrefslogtreecommitdiff
path: root/src/static_libs
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2018-12-04 20:38:07 +0100
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2018-12-07 13:05:31 +0100
commit500a36ba3d3d00ed292ed3e85bb9ac40a55bd2a9 (patch)
treed19bbb3272cf471ccda916cf4dc86e0250171392 /src/static_libs
parent79ded15ad3c0074e1d378cc5a0accad2399fcc24 (diff)
meson: add inital support for windows compilation
Differential Revision: https://phab.enlightenment.org/D7416
Diffstat (limited to 'src/static_libs')
-rw-r--r--src/static_libs/draw/meson.build15
-rw-r--r--src/static_libs/rg_etc/meson.build7
2 files changed, 5 insertions, 17 deletions
diff --git a/src/static_libs/draw/meson.build b/src/static_libs/draw/meson.build
index 250e021..c1b72c5 100644
--- a/src/static_libs/draw/meson.build
+++ b/src/static_libs/draw/meson.build
@@ -9,7 +9,7 @@ draw_src = [
9 9
10draw_opt_lib = [ ] 10draw_opt_lib = [ ]
11 11
12if cpu_sse3 == true 12if cpu_sse3 == true and sys_windows == false
13 draw_opt = static_library('draw_opt', 13 draw_opt = static_library('draw_opt',
14 sources: [ 'draw_main_sse2.c' ], 14 sources: [ 'draw_main_sse2.c' ],
15 include_directories: config_dir + [include_directories(join_paths('..', '..', 'lib'))], 15 include_directories: config_dir + [include_directories(join_paths('..', '..', 'lib'))],
@@ -21,16 +21,9 @@ else
21 draw_src += [ 'draw_main_sse2.c' ] 21 draw_src += [ 'draw_main_sse2.c' ]
22endif 22endif
23 23
24draw_lib = static_library('draw',
25 draw_src,
26 dependencies : [eina, efl],
27 include_directories : config_dir + [include_directories(join_paths('..', '..', 'lib'))],
28 install: false,
29 link_with: draw_opt_lib,
30)
31
32draw = declare_dependency( 24draw = declare_dependency(
33 include_directories: [include_directories('.'), include_directories(join_paths('..', '..', 'lib'))], 25 include_directories: [include_directories('.'), include_directories(join_paths('..', '..', 'lib'))],
34 link_with: draw_lib, 26 dependencies: [eina, efl],
35 dependencies: [eina], 27 sources : draw_src,
28 link_with : draw_opt_lib
36) 29)
diff --git a/src/static_libs/rg_etc/meson.build b/src/static_libs/rg_etc/meson.build
index 3dad342..cd093da 100644
--- a/src/static_libs/rg_etc/meson.build
+++ b/src/static_libs/rg_etc/meson.build
@@ -5,12 +5,7 @@ rg_etc_src = [
5'rg_etc2.c', 5'rg_etc2.c',
6] 6]
7 7
8rg_etc_lib = static_library('rg_etc', rg_etc_src,
9 dependencies : eina,
10 include_directories : config_dir,
11)
12
13rg_etc = declare_dependency( 8rg_etc = declare_dependency(
14 include_directories: include_directories('.'), 9 include_directories: include_directories('.'),
15 link_with: rg_etc_lib 10 sources : rg_etc_src
16) 11)