FWGS/xash3d-fwgs
2
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs synced 2024-11-22 09:56:22 +01:00
Code Issues 2 Projects Releases Wiki Activity

waifulib: xcompile: preserve order of MACROS_TO_DESTOS, add -stdlib=libstdc++ to use system provided C++ standard library

Browse Source
This commit is contained in:
Alibek Omarov 2019-09-20 16:30:17 +03:00
parent 16e60bbb5f
commit 66323fe9ca
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/waifulib/xcompile.py
View File

@ -15,6 +15,7 @@ try: from fwgslib import get_flags_by_compiler
except: from waflib.extras.fwgslib import get_flags_by_compiler except: from waflib.extras.fwgslib import get_flags_by_compiler
from waflib import Logs from waflib import Logs
from waflib.Tools import c_config from waflib.Tools import c_config
from collections import OrderedDict
import os import os
import sys import sys
@ -271,7 +272,7 @@ class Android:
return linkflags return linkflags
def ldflags(self): def ldflags(self):
ldflags = ['-lgcc', '-no-canonical-prefixes'] ldflags = ['-stdlib=libstdc++', '-lgcc', '-no-canonical-prefixes']
if self.is_arm(): if self.is_arm():
if self.arch == 'armeabi-v7a': if self.arch == 'armeabi-v7a':
ldflags += ['-march=armv7-a'] ldflags += ['-march=armv7-a']
@ -325,10 +326,9 @@ def configure(conf):
# conf.env.ANDROID_OPTS = android # conf.env.ANDROID_OPTS = android
conf.env.DEST_OS2 = 'android' conf.env.DEST_OS2 = 'android'
MACRO_TO_DESTOS = { MACRO_TO_DESTOS = OrderedDict({ '__ANDROID__' : 'android' })
'__ANDROID__' : 'android' for k in c_config.MACRO_TO_DESTOS:
} MACRO_TO_DESTOS[k] = c_config.MACRO_TO_DESTOS[k] # ordering is important
MACRO_TO_DESTOS.update(c_config.MACRO_TO_DESTOS) # ordering is important
c_config.MACRO_TO_DESTOS = MACRO_TO_DESTOS c_config.MACRO_TO_DESTOS = MACRO_TO_DESTOS
def post_compiler_cxx_configure(conf): def post_compiler_cxx_configure(conf):