Merge pull request #28 from RichyHBM/keep-env-windows

Fix using variable before defining it
pull/30/head
Thomas Herzog 2017-07-29 14:32:53 +02:00 committed by GitHub
commit 501a30856b
1 changed files with 3 additions and 4 deletions

View File

@ -9,6 +9,9 @@ godot_bin_path = "../godot_fork/bin/"
# for windows # for windows
godot_lib_path = "../godot_fork/bin/" godot_lib_path = "../godot_fork/bin/"
target = ARGUMENTS.get("target", "debug")
platform = ARGUMENTS.get("p", "linux")
# This makes sure to keep the session environment variables on windows, # This makes sure to keep the session environment variables on windows,
# that way you can run scons in a vs 2017 prompt and it will find all the required tools # that way you can run scons in a vs 2017 prompt and it will find all the required tools
env = Environment() env = Environment()
@ -18,10 +21,6 @@ if platform == "windows":
if ARGUMENTS.get("use_llvm", "no") == "yes": if ARGUMENTS.get("use_llvm", "no") == "yes":
env["CXX"] = "clang++" env["CXX"] = "clang++"
target = ARGUMENTS.get("target", "debug")
platform = ARGUMENTS.get("p", "linux")
godot_name = "godot." + ("x11" if platform == "linux" else platform) + ".tools.64" godot_name = "godot." + ("x11" if platform == "linux" else platform) + ".tools.64"