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