Просмотр исходного кода

Updating xcode configs. (#248)

- Matching all xcode actions.
- Setting targetdir for the `Native` platform.
Johan Sköld 5 лет назад
Родитель
Сommit
7ea784fa27
1 измененных файлов с 6 добавлено и 4 удалено
  1. 6 4
      scripts/toolchain.lua

+ 6 - 4
scripts/toolchain.lua

@@ -463,9 +463,7 @@ function toolchain(_buildDir, _libDir)
 
 
 		end
 		end
 
 
-	elseif _ACTION == "xcode4"
-		or _ACTION == "xcode8"
-		or _ACTION == "xcode9" then
+	elseif _ACTION and _ACTION:match("^xcode.+$") then
 		local action = premake.action.current()
 		local action = premake.action.current()
 		local str_or = function(str, def)
 		local str_or = function(str, def)
 			return #str > 0 and str or def
 			return #str > 0 and str or def
@@ -1007,7 +1005,11 @@ function toolchain(_buildDir, _libDir)
 
 
 	configuration { "osx", "Universal" }
 	configuration { "osx", "Universal" }
 		targetdir (path.join(_buildDir, "osx_universal/bin"))
 		targetdir (path.join(_buildDir, "osx_universal/bin"))
-		objdir (path.join(_buildDir, "osx_universal/bin"))
+		objdir (path.join(_buildDir, "osx_universal/obj"))
+
+	configuration { "osx", "Native" }
+		targetdir (path.join(_buildDir, "osx/bin"))
+		objdir (path.join(_buildDir, "osx/obj"))
 
 
 	configuration { "osx" }
 	configuration { "osx" }
 		buildoptions {
 		buildoptions {