diff options
| author | David Robillard <d@drobilla.net> | 2020-11-25 16:50:59 +0100 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2020-11-25 16:50:59 +0100 |
| commit | efb12030a1179dfd567f6c1b737a49291eebe19d (patch) | |
| tree | 425f2054fd9292f0831c04e3c8416a6d92657ebc /extras/xcode6.py | |
| parent | d19992202543ebb810609c074f754b5ec48c0fd7 (diff) | |
| download | autowaf-efb12030a1179dfd567f6c1b737a49291eebe19d.tar.gz autowaf-efb12030a1179dfd567f6c1b737a49291eebe19d.tar.bz2 autowaf-efb12030a1179dfd567f6c1b737a49291eebe19d.zip | |
Upgrade to waf 2.0.21
Diffstat (limited to 'extras/xcode6.py')
| -rw-r--r-- | extras/xcode6.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/extras/xcode6.py b/extras/xcode6.py index 91bbff1..c5b3091 100644 --- a/extras/xcode6.py +++ b/extras/xcode6.py @@ -99,7 +99,7 @@ env.PROJ_CONFIGURATION = { ... } 'Release': { - 'ARCHS' x86_64' + 'ARCHS': x86_64' ... } } @@ -163,12 +163,12 @@ class XCodeNode(object): result = result + "\t\t}" return result elif isinstance(value, str): - return "\"%s\"" % value + return '"%s"' % value.replace('"', '\\\\\\"') elif isinstance(value, list): result = "(\n" for i in value: - result = result + "\t\t\t%s,\n" % self.tostring(i) - result = result + "\t\t)" + result = result + "\t\t\t\t%s,\n" % self.tostring(i) + result = result + "\t\t\t)" return result elif isinstance(value, XCodeNode): return value._id @@ -565,13 +565,13 @@ def process_xcode(self): # Override target specific build settings bldsettings = { '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), - 'OTHER_LDFLAGS': libs + ' ' + frameworks, - 'OTHER_LIBTOOLFLAGS': bld.env['LINKFLAGS'], + 'OTHER_LDFLAGS': libs + ' ' + frameworks + ' ' + ' '.join(bld.env['LINKFLAGS']), 'OTHER_CPLUSPLUSFLAGS': Utils.to_list(self.env['CXXFLAGS']), 'OTHER_CFLAGS': Utils.to_list(self.env['CFLAGS']), - 'INSTALL_PATH': [] + 'INSTALL_PATH': [], + 'GCC_PREPROCESSOR_DEFINITIONS': self.env['DEFINES'] } # Install path @@ -591,7 +591,7 @@ def process_xcode(self): # The keys represents different build configuration, e.g. Debug, Release and so on.. # Insert our generated build settings to all configuration names - keys = set(settings.keys() + bld.env.PROJ_CONFIGURATION.keys()) + keys = set(settings.keys()) | set(bld.env.PROJ_CONFIGURATION.keys()) for k in keys: if k in settings: settings[k].update(bldsettings) |