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

@@ -4,7 +4,7 @@ import os.path as path
Import("env platform")
if str(platform) != "win32":
print "Error: Building for", str(platform), "but trying to create a Windows installer package"
print(f"Error: Building for {platform}, but trying to create a Windows installer package")
env.Depends("data.nsi", ["gen-data.py", "#build/Blades of Exile/data"])

View File

@@ -24,11 +24,11 @@ files = {
}
for path, pattern in files.items():
print 'SetOutPath', '"' + makepath("$INSTDIR/" + path + '/') + '"'
print('SetOutPath "' + makepath('$INSTDIR/' + path + '/') + '"')
if type(pattern) == list:
check_files = [root + '/' + path + '/' + x for x in pattern]
else:
check_files = glob(makepath(root + '/' + path + '/' + pattern))
for fname in check_files:
print 'File', '"' + makepath(fname.replace(root, '${RELEASE_DIR}')) + '"'
print('File "' + makepath(fname.replace(root, '${RELEASE_DIR}')) + '"')