Merge branch 'master' of github.com:bkaradzic/bx

2026-02-18 13:03:06 +01:00 · 2015-01-31 13:46:44 -08:00
parent 519ae3ae18 be1a8f463f
commit 9d22087437
4 changed files with 2 additions and 3 deletions
--- a/scripts/toolchain.lua
+++ b/scripts/toolchain.lua
@@ -294,14 +294,13 @@ function toolchain(_buildDir, _libDir)
 	elseif _ACTION == "xcode4" then

 		if "osx" == _OPTIONS["xcode"] then
+			premake.xcode.toolset = "macosx"
 			location (_buildDir .. "projects/" .. _ACTION .. "-osx")
 		end
-
 		if "ios" == _OPTIONS["xcode"] then
+			premake.xcode.toolset = "iphoneos"
 			location (_buildDir .. "projects/" .. _ACTION .. "-ios")
 		end
-
-
 	end

 	flags {
--- a/tools/bin/darwin/genie
+++ b/tools/bin/darwin/genie
--- a/tools/bin/linux/genie
+++ b/tools/bin/linux/genie
--- a/tools/bin/windows/genie.exe
+++ b/tools/bin/windows/genie.exe