smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add the include dir in the meson_cross_file. 

This is needed to have kiwix-lib find the `mustache.hpp` include when
cross compiling.
This commit is contained in:
Matthieu Gautier 2019-01-09 17:53:16 +01:00
parent 17c6b68a62
commit 1d881d0612
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kiwixbuild/platforms/android.py
View File

@ -37,7 +37,7 @@ class AndroidPlatformInfo(PlatformInfo):
'binaries': self.binaries(install_path), 'binaries': self.binaries(install_path),
'root_path': pj(install_path, 'sysroot'), 'root_path': pj(install_path, 'sysroot'),
'extra_libs': ['-llog'], 'extra_libs': ['-llog'],
'extra_cflags': [], 'extra_cflags': ['-I{}'.format(pj(self.buildEnv.install_dir, 'include'))],
'host_machine': { 'host_machine': {
'system': 'Android', 'system': 'Android',
'lsystem': 'android', 'lsystem': 'android',

2
kiwixbuild/platforms/armhf.py
View File

@ -16,7 +16,7 @@ class ArmhfPlatformInfo(PlatformInfo):
'exec_wrapper_def': '', 'exec_wrapper_def': '',
'root_path': self.root_path, 'root_path': self.root_path,
'extra_libs': [], 'extra_libs': [],
'extra_cflags': [], 'extra_cflags': ['-I{}'.format(pj(self.buildEnv.install_dir, 'include'))],
'host_machine': { 'host_machine': {
'system': 'linux', 'system': 'linux',
'lsystem': 'linux', 'lsystem': 'linux',

2
kiwixbuild/platforms/i586.py
View File

@ -14,7 +14,7 @@ class I586PlatformInfo(PlatformInfo):
'binaries': self.binaries, 'binaries': self.binaries,
'exec_wrapper_def': '', 'exec_wrapper_def': '',
'extra_libs': ['-m32', '-march=i586', '-mno-sse'], 'extra_libs': ['-m32', '-march=i586', '-mno-sse'],
'extra_cflags': ['-m32', '-march=i586', '-mno-sse'], 'extra_cflags': ['-m32', '-march=i586', '-mno-sse', '-I{}'.format(pj(self.buildEnv.install_dir, 'include'))],
'host_machine': { 'host_machine': {
'system': 'linux', 'system': 'linux',
'lsystem': 'linux', 'lsystem': 'linux',

2
kiwixbuild/platforms/ios.py
View File

@ -35,7 +35,7 @@ class iOSPlatformInfo(PlatformInfo):
'binaries': self.binaries, 'binaries': self.binaries,
'exec_wrapper_def': '', 'exec_wrapper_def': '',
'extra_libs': ['-fembed-bitcode', '-isysroot', self.root_path, '-arch', self.arch, '-miphoneos-version-min=9.0', '-stdlib=libc++'], 'extra_libs': ['-fembed-bitcode', '-isysroot', self.root_path, '-arch', self.arch, '-miphoneos-version-min=9.0', '-stdlib=libc++'],
'extra_cflags': ['-fembed-bitcode', '-isysroot', self.root_path, '-arch', self.arch, '-miphoneos-version-min=9.0', '-stdlib=libc++'], 'extra_cflags': ['-fembed-bitcode', '-isysroot', self.root_path, '-arch', self.arch, '-miphoneos-version-min=9.0', '-stdlib=libc++', '-I{}'.format(pj(self.buildEnv.install_dir, 'include'))],
'host_machine': { 'host_machine': {
'system': 'Darwin', 'system': 'Darwin',
'lsystem': 'darwin', 'lsystem': 'darwin',

2
kiwixbuild/platforms/win32.py
View File

@ -17,7 +17,7 @@ class Win32PlatformInfo(PlatformInfo):
'binaries': self.binaries, 'binaries': self.binaries,
'root_path': self.root_path, 'root_path': self.root_path,
'extra_libs': self.extra_libs, 'extra_libs': self.extra_libs,
'extra_cflags': ['-DWIN32'], 'extra_cflags': ['-DWIN32', '-I{}'.format(pj(self.buildEnv.install_dir, 'include'))],
'host_machine': { 'host_machine': {
'system': 'Windows', 'system': 'Windows',
'lsystem': 'windows', 'lsystem': 'windows',