Daniele Bartolini 10 лет назад
Родитель
Сommit
4de4fd0c1f
2 измененных файлов с 2 добавлено и 21 удалено
  1. 0 9
      genie/crown.lua
  2. 2 12
      genie/toolchain.lua

+ 0 - 9
genie/crown.lua

@@ -129,19 +129,10 @@ function crown_project(_name, _kind, _defines)
 		end
 
 		configuration { "debug or development" }
-			flags {
-				"Symbols"
-			}
 			defines {
-				"_DEBUG",
 				"CROWN_DEBUG=1"
 			}
 
-		configuration { "release" }
-			defines {
-				"NDEBUG"
-			}
-
 		configuration { "android*" }
 			kind "ConsoleApp"
 			targetextension ".so"

+ 2 - 12
genie/toolchain.lua

@@ -39,9 +39,7 @@ function toolchain(build_dir, lib_dir)
 			end
 
 			location(build_dir .. "projects/" .. "linux")
-		end
-
-		if "android-arm" == _OPTIONS["compiler"] then
+		elseif "android-arm" == _OPTIONS["compiler"] then
 
 			if not os.getenv("ANDROID_NDK_ROOT") then
 				print("Set ANDROID_NDK_ROOT environment variable.")
@@ -56,9 +54,7 @@ function toolchain(build_dir, lib_dir)
 			premake.gcc.ar = "$(ANDROID_NDK_ARM)/bin/arm-linux-androideabi-ar"
 			location(build_dir .. "projects/" .. "android")
 		end
-	end
-
-	if _ACTION == "vs2013" then
+	elseif _ACTION == "vs2013" then
 
 		if not os.is("windows") then
 			print("Action not valid in current OS.")
@@ -122,9 +118,6 @@ function toolchain(build_dir, lib_dir)
 		libdirs {
 			lib_dir .. "../.build/linux32/bin",
 		}
-		buildoptions {
-			"-m32",
-		}
 
 	configuration { "x64", "linux-*" }
 		targetdir (build_dir .. "linux64" .. "/bin")
@@ -132,9 +125,6 @@ function toolchain(build_dir, lib_dir)
 		libdirs {
 			lib_dir .. "../.build/linux64/bin",
 		}
-		buildoptions {
-			"-m64",
-		}
 
 	configuration { "linux-*" }
 		buildoptions {