summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/genie/src/actions/xcode/xcode8.lua
diff options
context:
space:
mode:
Diffstat (limited to '3rdparty/genie/src/actions/xcode/xcode8.lua')
-rw-r--r--3rdparty/genie/src/actions/xcode/xcode8.lua16
1 files changed, 11 insertions, 5 deletions
diff --git a/3rdparty/genie/src/actions/xcode/xcode8.lua b/3rdparty/genie/src/actions/xcode/xcode8.lua
index c03c499f230..c7e1801f166 100644
--- a/3rdparty/genie/src/actions/xcode/xcode8.lua
+++ b/3rdparty/genie/src/actions/xcode/xcode8.lua
@@ -45,10 +45,11 @@
options.CLANG_ENABLE_OBJC_ARC = "YES"
end
- local outdir = path.getdirectory(cfg.buildtarget.bundlepath)
- if outdir ~= "." then
- options.CONFIGURATION_BUILD_DIR = outdir
- end
+-- local outdir = path.getdirectory(cfg.buildtarget.directory)
+-- if outdir ~= "." then
+-- options.CONFIGURATION_BUILD_DIR = outdir
+-- end
+ options.CONFIGURATION_BUILD_DIR = "$(SYSROOT)"
if tr.infoplist then
options.INFOPLIST_FILE = tr.infoplist.cfg.name
@@ -118,6 +119,11 @@
end
end
+ local defines = {}
+ for k, v in pairs(cfg.defines or {}) do
+ defines[k] = v:gsub('[\'"\\\n\r\t ]', function (c) return ({ ['\n'] = '\\n', ['\r'] = '\\r', ['\t'] = '\\t' })[c] or '\\'..c end)
+ end
+
-- options table to return
local options = {
ARCHS = archs[cfg.platform],
@@ -135,7 +141,7 @@
ENABLE_TESTABILITY = "YES",
GCC_C_LANGUAGE_STANDARD = "gnu99",
GCC_NO_COMMON_BLOCKS = "YES",
- GCC_PREPROCESSOR_DEFINITIONS = cfg.defines,
+ GCC_PREPROCESSOR_DEFINITIONS = defines,
GCC_SYMBOLS_PRIVATE_EXTERN = "NO",
GCC_WARN_64_TO_32_BIT_CONVERSION = "YES",
GCC_WARN_ABOUT_RETURN_TYPE = "YES",