Mirrors/bx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bx.git synced 2026-02-17 20:52:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

added Xcode target selection between iOS or OS X

Browse Source
This commit is contained in:
Attila Kocsis
2015-01-14 19:44:42 +01:00
parent 74d2239444
commit 505c85bc49
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
scripts/toolchain.lua
View File

@@ -45,6 +45,17 @@ function toolchain(_buildDir, _libDir)
},
}
newoption {
trigger = "xcode",
value = "xcode_target",
description = "Choose XCode target",
allowed = {
{ "osx", "OSX" },
{ "ios", "iOS" },
}
}
newoption {
trigger = "with-android",
value = "#",
@@ -280,6 +291,17 @@ function toolchain(_buildDir, _libDir)
platforms { "ARM" }
location (_buildDir .. "projects/" .. _ACTION .. "-winphone81")
end
elseif _ACTION == "xcode4" then
if "osx" == _OPTIONS["xcode"] then
location (_buildDir .. "projects/" .. _ACTION .. "-osx")
end
if "ios" == _OPTIONS["xcode"] then
location (_buildDir .. "projects/" .. _ACTION .. "-ios")
end
end
flags {
@@ -740,7 +762,7 @@ function toolchain(_buildDir, _libDir)
}
includedirs { bxDir .. "include/compat/osx" }
configuration { "ios-*" }
configuration { "ios*" }
linkoptions {
"-lc++",
}