mirror of https://gitlab.com/ita1024/waf.git
Fix configuration of linker flags in Xcode file
This commit is contained in:
parent
84e71c9408
commit
f67f175c39
|
@ -99,7 +99,7 @@ env.PROJ_CONFIGURATION = {
|
||||||
...
|
...
|
||||||
}
|
}
|
||||||
'Release': {
|
'Release': {
|
||||||
'ARCHS' x86_64'
|
'ARCHS': x86_64'
|
||||||
...
|
...
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -565,10 +565,9 @@ 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': []
|
||||||
|
|
Loading…
Reference in New Issue