Skip to content

Commit cec7166

Browse files
committed
added manually specifying arcom
1 parent 85ebdbe commit cec7166

2 files changed

Lines changed: 11 additions & 6 deletions

File tree

SConstruct

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,9 @@ opts.Add("AS", "Assembler binary")
125125
opts.Add("AR", "Archiver binary")
126126
opts.Add("RANLIB", "Ranlib binary")
127127
opts.Add("RC", "Resource compiler binary")
128+
# Set this to something like "${TEMPFILE('$AR rcs $TARGET $SOURCES','$ARCOMSTR')}" if you get errors related to a command being too long.
129+
# This is a common error on Windows machines.
130+
opts.Add("ARCOM", "Custom command used to generate an object file from an assembly-language source file.")
128131
opts.Add("cppdefines", "Custom defines for the pre-processor")
129132
opts.Add("ccflags", "Custom flags for both the C and C++ compilers")
130133
opts.Add("cxxflags", "Custom flags for the C++ compiler")

godot-tools/windows.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,12 @@ def generate(env):
4040

4141
env["is_msvc"] = True
4242

43-
# MSVC, linker, and archiver.
44-
msvc.generate(env)
45-
env.Tool("msvc")
46-
env.Tool("mslib")
47-
env.Tool("mslink")
43+
if env["platform_tools"]:
44+
# MSVC, linker, and archiver.
45+
msvc.generate(env)
46+
env.Tool("msvc")
47+
env.Tool("mslib")
48+
env.Tool("mslink")
4849

4950
env.Append(CPPDEFINES=["TYPED_METHOD_BIND", "NOMINMAX"])
5051
env.Append(CCFLAGS=["/EHsc", "/utf-8"])
@@ -64,7 +65,8 @@ def generate(env):
6465

6566
elif (sys.platform == "win32" or sys.platform == "msys") and not env["mingw_prefix"]:
6667
env["use_mingw"] = True
67-
mingw.generate(env)
68+
if env["platform_tools"]:
69+
mingw.generate(env)
6870
env.Append(CPPDEFINES=["MINGW_ENABLED"])
6971
# Don't want lib prefixes
7072
env["IMPLIBPREFIX"] = ""

0 commit comments

Comments
 (0)