forked from enlightenment/efl
windows: Use correct pcre header, fix missing evil_unposix declaration
This commit is contained in:
parent
23459a4eb5
commit
8437d20dc8
|
@ -226,7 +226,7 @@ if sys_windows == true
|
|||
zlib_dep = zlib_project.get_variable('zlib_dep')
|
||||
zlib_include_dir = zlib_project.get_variable('incdir')
|
||||
else
|
||||
zlib = dependency('zlib')
|
||||
zlib_dep = dependency('zlib')
|
||||
if not cc.has_header_symbol('regex.h', 'regcomp')
|
||||
error('regcomp can not be found')
|
||||
endif
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
evil_deps = []
|
||||
evil_pub_deps = []
|
||||
|
||||
if target_machine.system() == 'windows'
|
||||
subdir('unposix')
|
||||
|
||||
evil_src = [
|
||||
'evil_dlfcn.c',
|
||||
'evil_fcntl.c',
|
||||
|
@ -25,8 +24,11 @@ if target_machine.system() == 'windows'
|
|||
secur32 = cc.find_library('secur32')
|
||||
uuid = cc.find_library('uuid')
|
||||
|
||||
evil_deps = [psapi, ole32, ws2_32, secur32, uuid, pcre_dep, evil_unposix]
|
||||
evil_pub_deps = [psapi, ole32, ws2_32, secur32, uuid, pcre_dep, evil_unposix]
|
||||
|
||||
evil_lib = library('evil', evil_src,
|
||||
dependencies : [psapi, ole32, ws2_32, secur32, uuid, pcre_dep, evil_unposix],
|
||||
dependencies : evil_deps,
|
||||
include_directories : [config_dir],
|
||||
install: true,
|
||||
version: meson.project_version(),
|
||||
|
@ -34,7 +36,7 @@ if target_machine.system() == 'windows'
|
|||
|
||||
evil = declare_dependency(
|
||||
include_directories: [include_directories('.')],
|
||||
dependencies : [psapi, ole32, ws2_32, secur32, uuid, pcre_dep, evil_unposix],
|
||||
dependencies : evil_pub_deps,
|
||||
link_with: evil_lib,
|
||||
)
|
||||
else
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#ifndef __EVIL_PCRE_REGEX_H__
|
||||
#define __EVIL_PCRE_REGEX_H__
|
||||
#ifndef EVIL_PCRE_REGEX_H
|
||||
#define EVIL_PCRE_REGEX_H
|
||||
|
||||
#include <pcreposix.h>
|
||||
#include <pcre.h>
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -24,14 +24,14 @@ if sys_windows
|
|||
evil_unposix_lib = static_library('evil_unposix',
|
||||
evil_unposix_src,
|
||||
include_directories: [include_directories('.'), config_dir],
|
||||
dependencies : [],
|
||||
dependencies : [pcre_dep],
|
||||
install: true,
|
||||
version: meson.project_version(),
|
||||
)
|
||||
|
||||
evil_unposix = declare_dependency(
|
||||
include_directories: [include_directories('.')],
|
||||
dependencies: [],
|
||||
dependencies: [pcre_dep],
|
||||
link_with: evil_unposix_lib,
|
||||
)
|
||||
|
||||
|
|
Loading…
Reference in New Issue