summaryrefslogtreecommitdiff
path: root/src/lib/evil/meson.build
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2019-04-18 09:31:51 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-04-18 12:30:22 -0400
commitecce595b241763dd3029a1bc39f10f4f664b3c9a (patch)
tree6b8cf50e27d676911a1d99900997f4b20431e725 /src/lib/evil/meson.build
parente65c49b4224d4c4d27f67bbc1c91e8d2bc8450e8 (diff)
Windows: remove fnmatch and regex in Evil and use the ones in regex DLL installed by ewpi
Test Plan: compilation with autotools and meson (at least as far as it can go) Reviewers: zmike, raster Reviewed By: zmike Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8646
Diffstat (limited to 'src/lib/evil/meson.build')
-rw-r--r--src/lib/evil/meson.build15
1 files changed, 4 insertions, 11 deletions
diff --git a/src/lib/evil/meson.build b/src/lib/evil/meson.build
index 482e733637..0402b373c7 100644
--- a/src/lib/evil/meson.build
+++ b/src/lib/evil/meson.build
@@ -18,17 +18,13 @@ if target_machine.system() == 'windows'
18 'evil_unistd.h', 18 'evil_unistd.h',
19 'evil_util.h', 19 'evil_util.h',
20 'dirent.h', 20 'dirent.h',
21 'fnmatch.h',
22 'pwd.h', 21 'pwd.h',
23 'regex/regex.h'
24 ] 22 ]
25 evil_header_sys_src = [join_paths('sys','mman.h')] 23 evil_header_sys_src = [join_paths('sys','mman.h')]
26 24
27 evil_src = [ 25 evil_src = [
28 'evil_dlfcn.c', 26 'evil_dlfcn.c',
29 'evil_fcntl.c', 27 'evil_fcntl.c',
30 'evil_fnmatch.c',
31 'evil_fnmatch_list_of_states.c',
32 'evil_langinfo.c', 28 'evil_langinfo.c',
33 'evil_locale.c', 29 'evil_locale.c',
34 'evil_main.c', 30 'evil_main.c',
@@ -41,11 +37,8 @@ if target_machine.system() == 'windows'
41 'evil_unistd.c', 37 'evil_unistd.c',
42 'evil_util.c', 38 'evil_util.c',
43 'evil_private.h', 39 'evil_private.h',
44 'evil_fnmatch_private.h',
45 ] 40 ]
46 41
47 subdir('regex')
48
49 psapi = cc.find_library('psapi') 42 psapi = cc.find_library('psapi')
50 ole32 = cc.find_library('ole32') 43 ole32 = cc.find_library('ole32')
51 ws2_32 = cc.find_library('ws2_32') 44 ws2_32 = cc.find_library('ws2_32')
@@ -53,13 +46,13 @@ if target_machine.system() == 'windows'
53 uuid = cc.find_library('uuid') 46 uuid = cc.find_library('uuid')
54 47
55 evil_lib = library('evil', evil_src, 48 evil_lib = library('evil', evil_src,
56 dependencies : [psapi, ole32, ws2_32, secur32, uuid], 49 dependencies : [psapi, ole32, ws2_32, secur32, uuid, regexp],
57 include_directories : [config_dir, include_directories('regex')], 50 include_directories : [config_dir],
58 ) 51 )
59 52
60 evil = declare_dependency( 53 evil = declare_dependency(
61 include_directories: [config_dir, include_directories('regex'), include_directories('.')], 54 include_directories: [include_directories('.')],
62 dependencies : [psapi, ole32, ws2_32, secur32, uuid], 55 dependencies : [psapi, ole32, ws2_32, secur32, uuid, regexp],
63 link_with: evil_lib, 56 link_with: evil_lib,
64 ) 57 )
65else 58else