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

Add WIN32 flag definition. 

When switching to c++11, the WIN32 flags is no more automatically defined.
So let's define it in the meson crossfile itself.
This commit is contained in:
Matthieu Gautier 2017-04-11 16:57:51 +02:00
parent 2fc1b7ebe8
commit 6a24b38169
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kiwix-build.py
View File

@ -29,6 +29,7 @@ CROSS_ENV = {
'toolchain_names': ['mingw32_toolchain'],
'root_path': '/usr/i686-w64-mingw32/sys-root/mingw',
'extra_libs': ['-lwinmm', '-lws2_32', '-lshlwapi', '-lrpcrt4', '-lmsvcr90'],
'extra_cflags': ['-DWIN32'],
'host_machine': {
'system': 'windows',
'cpu_family': 'x86',
@ -39,6 +40,7 @@ CROSS_ENV = {
'fedora_android': {
'toolchain_names': ['android_ndk'],
'extra_libs': [],
'extra_cflags': [],
'host_machine': {
'system': 'Android',
'cpu_family': 'x86',
@ -50,6 +52,7 @@ CROSS_ENV = {
'toolchain_names': ['mingw32_toolchain'],
'root_path': '/usr/i686-w64-mingw32/',
'extra_libs': ['-lwinmm', '-lws2_32', '-lshlwapi', '-lrpcrt4', '-lmsvcr90'],
'extra_cflags': ['-DWIN32'],
'host_machine': {
'system': 'windows',
'cpu_family': 'x86',
@ -60,6 +63,7 @@ CROSS_ENV = {
'debian_android': {
'toolchain_names': ['android_ndk'],
'extra_libs': [],
'extra_cflags': [],
'host_machine': {
'system': 'Android',
'cpu_family': 'x86',

2
templates/meson_cross_file.txt
View File

@ -8,6 +8,8 @@ strip = '{toolchain.binaries[STRIP]}'
[properties]
c_link_args = {extra_libs!r}
cpp_link_args = {extra_libs!r}
c_args = {extra_cflags!r}
cpp_args = {extra_cflags!r}
[host_machine]
cpu_family = '{host_machine[cpu_family]}'