Fix win scons (#359)

* fix a link flag
* another hack to find weirdly named libraries
* Fix handling VCRedistInstall.exe
* add src folders to win-scons include paths
* use path.join
* more weird library suffixes
* fix old python syntax in an SConscript file
* find vcpkg libraries and headers
* add icon dir to windows include paths
* remove non-recursive os.listdir line
* remove bad lib paths
* tools build with env["bits"]
* hard-code vcvarsall.bat path, with a note
* pass in other lib paths
* fix syntax without trying to use f-strings
* more bundled libs on windows
* add bin folders for windows installation to find dlls
* fix CheckLib stuff
* test scons pass X86 correctly
* make 64-bit builds the default for scons
* add package flag for building installers
This commit is contained in:
2024-06-12 11:52:19 -06:00
committed by GitHub
parent e344542b39
commit 4a7d145168
7 changed files with 77 additions and 31 deletions

View File

@@ -2,6 +2,7 @@
import subprocess
Import("env platform party_classes common_sources")
arch_short = '64' if (env['bits'] == '64') else '86'
# Add path to scons
env.Append(CPPPATH=['./deps/Catch2/single_include'])
@@ -11,7 +12,7 @@ test_sources = Glob("""*.cpp""") + Split("""
""")
if str(platform) == "win32" and 'msvc' in env["TOOLS"]:
test = env.Program("#build/bin/boe_test", party_classes + common_sources + test_sources, LINKFLAGS='/nologo /SUBSYSTEM:CONSOLE /MACHINE:X86')
test = env.Program("#build/bin/boe_test", party_classes + common_sources + test_sources, LINKFLAGS=f'/nologo /SUBSYSTEM:CONSOLE /MACHINE:X{arch_short}')
else:
test = env.Program("#build/bin/boe_test", test_sources + party_classes + common_sources)