Skip to content

Commit

Permalink
added manually specifying arcom
Browse files Browse the repository at this point in the history
  • Loading branch information
TCROC committed Oct 13, 2024
1 parent d19bfa5 commit 1f82c31
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
3 changes: 3 additions & 0 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,9 @@ opts.Add("AS", "Assembler binary")
opts.Add("AR", "Archiver binary")
opts.Add("RANLIB", "Ranlib binary")
opts.Add("RC", "Resource compiler binary")
# Set this to something like "${TEMPFILE('$AR rcs $TARGET $SOURCES','$ARCOMSTR')}" if you get errors related to a command being too long.
# This is a common error on Windows machines.
opts.Add("ARCOM", "Custom command used to generate an object file from an assembly-language source file.")
opts.Add("cppdefines", "Custom defines for the pre-processor")
opts.Add("ccflags", "Custom flags for both the C and C++ compilers")
opts.Add("cxxflags", "Custom flags for the C++ compiler")
Expand Down
14 changes: 8 additions & 6 deletions godot-tools/windows.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,12 @@ def generate(env):

env["is_msvc"] = True

# MSVC, linker, and archiver.
msvc.generate(env)
env.Tool("msvc")
env.Tool("mslib")
env.Tool("mslink")
if env["platform_tools"]:
# MSVC, linker, and archiver.
msvc.generate(env)
env.Tool("msvc")
env.Tool("mslib")
env.Tool("mslink")

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

elif (sys.platform == "win32" or sys.platform == "msys") and not env["mingw_prefix"]:
env["use_mingw"] = True
mingw.generate(env)
if env["platform_tools"]:
mingw.generate(env)
env.Append(CPPDEFINES=["MINGW_ENABLED"])
# Don't want lib prefixes
env["IMPLIBPREFIX"] = ""
Expand Down

0 comments on commit 1f82c31

Please sign in to comment.