summaryrefslogtreecommitdiff
path: root/src/lib/evil
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2019-02-28 13:21:56 +0100
committerStefan Schmidt <s.schmidt@samsung.com>2019-02-28 14:36:42 +0100
commit8a7cb97e02bf0448946d4a2ddd355d394e9d8804 (patch)
treed73e0520391a1546841f09a8aa2f912adcb93ad8 /src/lib/evil
parent5861aad1853a2f6ba929bc4597996ca7782a3631 (diff)
Eina: implement strtod in C locale and remove linkl against msvcr100.
Summary: This fixes compilation on Windows More precisely edje_cc could not compile emotion edc files, so it was a runtime problem because of msvcr100 link. Add more tests than before Test Plan: compilation Reviewers: raster Subscribers: zmike, stefan_schmidt, cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D7926
Diffstat (limited to 'src/lib/evil')
-rw-r--r--src/lib/evil/meson.build5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/evil/meson.build b/src/lib/evil/meson.build
index ff9630a..482e733 100644
--- a/src/lib/evil/meson.build
+++ b/src/lib/evil/meson.build
@@ -51,16 +51,15 @@ if target_machine.system() == 'windows'
51 ws2_32 = cc.find_library('ws2_32') 51 ws2_32 = cc.find_library('ws2_32')
52 secur32 = cc.find_library('secur32') 52 secur32 = cc.find_library('secur32')
53 uuid = cc.find_library('uuid') 53 uuid = cc.find_library('uuid')
54 msvcr100 = cc.find_library('msvcr100')
55 54
56 evil_lib = library('evil', evil_src, 55 evil_lib = library('evil', evil_src,
57 dependencies : [psapi, ole32, ws2_32, secur32, uuid, msvcr100], 56 dependencies : [psapi, ole32, ws2_32, secur32, uuid],
58 include_directories : [config_dir, include_directories('regex')], 57 include_directories : [config_dir, include_directories('regex')],
59 ) 58 )
60 59
61 evil = declare_dependency( 60 evil = declare_dependency(
62 include_directories: [config_dir, include_directories('regex'), include_directories('.')], 61 include_directories: [config_dir, include_directories('regex'), include_directories('.')],
63 dependencies : [psapi, ole32, ws2_32, secur32, uuid, msvcr100], 62 dependencies : [psapi, ole32, ws2_32, secur32, uuid],
64 link_with: evil_lib, 63 link_with: evil_lib,
65 ) 64 )
66else 65else