FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'xcode-fixes' into 'master' 

Xcode project generation improvements

See merge request ita1024/waf!2291
This commit is contained in:
Johan Pauwels 2020-05-20 10:59:43 +00:00
parent 3ce7da0976 058552063c
commit 2063b4cbd0
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
waflib/extras/xcode6.py
View File

@ -99,7 +99,7 @@ env.PROJ_CONFIGURATION = {
... ...
} }
'Release': { 'Release': {
'ARCHS' x86_64' 'ARCHS': x86_64'
... ...
} }
} }
@ -163,12 +163,12 @@ class XCodeNode(object):
result = result + "\t\t}" result = result + "\t\t}"
return result return result
elif isinstance(value, str): elif isinstance(value, str):
return "\"%s\"" % value return '"%s"' % value.replace('"', '\\\\\\"')
elif isinstance(value, list): elif isinstance(value, list):
result = "(\n" result = "(\n"
for i in value: for i in value:
result = result + "\t\t\t%s,\n" % self.tostring(i) result = result + "\t\t\t\t%s,\n" % self.tostring(i)
result = result + "\t\t)" result = result + "\t\t\t)"
return result return result
elif isinstance(value, XCodeNode): elif isinstance(value, XCodeNode):
return value._id return value._id
@ -565,13 +565,13 @@ def process_xcode(self):
# Override target specific build settings # Override target specific build settings
bldsettings = { bldsettings = {
'HEADER_SEARCH_PATHS': ['$(inherited)'] + self.env['INCPATHS'], 'HEADER_SEARCH_PATHS': ['$(inherited)'] + self.env['INCPATHS'],
'LIBRARY_SEARCH_PATHS': ['$(inherited)'] + Utils.to_list(self.env.LIBPATH) + Utils.to_list(self.env.STLIBPATH) + Utils.to_list(self.env.LIBDIR) , 'LIBRARY_SEARCH_PATHS': ['$(inherited)'] + Utils.to_list(self.env.LIBPATH) + Utils.to_list(self.env.STLIBPATH) + Utils.to_list(self.env.LIBDIR),
'FRAMEWORK_SEARCH_PATHS': ['$(inherited)'] + Utils.to_list(self.env.FRAMEWORKPATH), 'FRAMEWORK_SEARCH_PATHS': ['$(inherited)'] + Utils.to_list(self.env.FRAMEWORKPATH),
'OTHER_LDFLAGS': libs + ' ' + frameworks, 'OTHER_LDFLAGS': libs + ' ' + frameworks + ' ' + ' '.join(bld.env['LINKFLAGS']),
'OTHER_LIBTOOLFLAGS': bld.env['LINKFLAGS'],
'OTHER_CPLUSPLUSFLAGS': Utils.to_list(self.env['CXXFLAGS']), 'OTHER_CPLUSPLUSFLAGS': Utils.to_list(self.env['CXXFLAGS']),
'OTHER_CFLAGS': Utils.to_list(self.env['CFLAGS']), 'OTHER_CFLAGS': Utils.to_list(self.env['CFLAGS']),
'INSTALL_PATH': [] 'INSTALL_PATH': [],
'GCC_PREPROCESSOR_DEFINITIONS': self.env['DEFINES']
} }
# Install path # Install path