Merge pull request #54837 from akien-mga/windows-bigobj
This commit is contained in:
commit
9b6897307c
@ -226,9 +226,10 @@ def configure_msvc(env, manual_msvc_config):
|
||||
env.AppendUnique(CCFLAGS=["/MD"])
|
||||
|
||||
env.AppendUnique(CCFLAGS=["/Gd", "/GR", "/nologo"])
|
||||
# Force to use Unicode encoding
|
||||
env.AppendUnique(CCFLAGS=["/utf-8"])
|
||||
env.AppendUnique(CCFLAGS=["/utf-8"]) # Force to use Unicode encoding.
|
||||
env.AppendUnique(CCFLAGS=["/bigobj"]) # Allow big objects, no drawbacks.
|
||||
env.AppendUnique(CXXFLAGS=["/TP"]) # assume all sources are C++
|
||||
|
||||
if manual_msvc_config: # should be automatic if SCons found it
|
||||
if os.getenv("WindowsSdkDir") is not None:
|
||||
env.Prepend(CPPPATH=[os.getenv("WindowsSdkDir") + "/Include"])
|
||||
@ -421,6 +422,7 @@ def configure_mingw(env):
|
||||
## Compile flags
|
||||
|
||||
env.Append(CCFLAGS=["-mwindows"])
|
||||
env.Append(CCFLAGS=["-Wa,-mbig-obj"]) # Allow big objects, no drawbacks.
|
||||
|
||||
env.Append(CPPDEFINES=["WINDOWS_ENABLED", "WASAPI_ENABLED", "WINMIDI_ENABLED"])
|
||||
env.Append(CPPDEFINES=[("WINVER", env["target_win_version"]), ("_WIN32_WINNT", env["target_win_version"])])
|
||||
|
Loading…
Reference in New Issue
Block a user