Fix win scons

.github/workflows/ci.yml

@@ -154,7 +154,8 @@
 				{
 					name: build and unit test,
 					run: '.\.github\workflows\scripts\win\scons-build.bat'
-				}
+				},
+
 			]
 		},
 		# win-mingw: {

.github/workflows/scripts/win/scons-build.bat

@@ -1,8 +1,15 @@
 
 setlocal enabledelayedexpansion
 
-for /f "usebackq tokens=*" %%i in (`vswhere -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -find **/Auxiliary/Build/vcvarsall.bat`) do (
-  call "%%i" x86_amd64
-)
+REM This for loop takes a long time to find vcvarsall.bat,
+REM so I hard-coded the path in. When Github Runner versions change,
+REM the for loop might be needed again to discover the right path.
 
-scons
+REM for /f "usebackq tokens=*" %%i in (`vswhere -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -find **/Auxiliary/Build/vcvarsall.bat`) do (
+REM  @echo "%%i"
+REM  call "%%i" x86_amd64
+REM )
+
+call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
+
+scons bits=64

SConstruct

@@ -185,12 +185,25 @@ if platform == "darwin":
 					break
 elif platform == "win32":
 	if 'msvc' in env['TOOLS']:
-		vcpkg_prefix = (os.environ['HOME'] if 'HOME' in os.environ else 'C:') + f'/vcpkg/installed/x{env["bits"]}-windows'
+		vcpkg_prefix = path.join((os.environ['HOME'] if 'HOME' in os.environ else 'C:\\'), 'vcpkg')
+		vcpkg_installed = path.join(vcpkg_prefix, 'installed', f'x{env["bits"]}-windows')
+		vcpkg_other_packages = Glob(path.join(vcpkg_prefix, 'packages', f'**x{env["bits"]}-windows'))
+		vcpkg_other_includes = [path.join(d.get_abspath(), 'include') for d in vcpkg_other_packages]
+		vcpkg_other_includes = list(filter(path.exists, vcpkg_other_includes))
+		vcpkg_other_libs = [path.join(d.get_abspath(), 'lib') for d in vcpkg_other_packages]
+		vcpkg_other_libs = list(filter(path.exists, vcpkg_other_libs))
+		vcpkg_other_bins = [path.join(d.get_abspath(), 'bin') for d in vcpkg_other_packages]
+		vcpkg_other_bins = list(filter(path.exists, vcpkg_other_bins))
+		project_includes = []
+		for (root, dirs, files) in os.walk('src'):
+			project_includes.append(path.join(os.getcwd(), root))
+
+		include_paths=[path.join(vcpkg_installed, 'include')] + vcpkg_other_includes + project_includes
 		env.Append(
-			LINKFLAGS=['/SUBSYSTEM:WINDOWS','/ENTRY:mainCRTStartup','/MACHINE:X86'],
+			LINKFLAGS=['/SUBSYSTEM:WINDOWS','/ENTRY:mainCRTStartup',f'/MACHINE:X{env["bits"]}'],
 			CXXFLAGS=['/EHsc','/MD','/FIglobal.hpp'],
-			INCLUDEPATH=vcpkg_prefix + '/include',
-			LIBPATH=vcpkg_prefix + '/lib',
+			CPPPATH=include_paths,
+			LIBPATH=[path.join(vcpkg_installed, 'lib')] + vcpkg_other_libs + vcpkg_other_bins,
 			LIBS=Split("""
 				kernel32
 				user32
@@ -269,6 +282,8 @@ env.Append(CPPPATH=Split("""
 
 env['CONFIGUREDIR'] = '#build/conf'
 env['CONFIGURELOG'] = '#build/conf/config.log'
+
+bundled_libs = []
 if not env.GetOption('clean'):
 	conf = Configure(env)
 
@@ -280,15 +295,14 @@ if not env.GetOption('clean'):
 		print('zlib must be installed!')
 		Exit(1)
 
-	def check_lib(lib, disp, suffixes=[], versions=[]):
-		if platform == "win32" and lib.startswith("boost"):
-			lib = "lib" + lib
+	def check_lib(lib, disp, suffixes=[], versions=[], msvc_versions=[]):
 		if "mingw" in env["TOOLS"] and lib.startswith("sfml"):
 			lib = "lib" + lib
 		possible_names = [lib]
 		if platform == "win32":
 			if 'msvc' in env['TOOLS']:
-				vc_suffix = '-vc' + env['MSVC_VERSION'].replace('.','')
+				msvc_version = env['MSVC_VERSION'].replace('.','')
+				vc_suffix = '-vc' + msvc_version
 				possible_names.append(lib + vc_suffix)
 		n = len(possible_names)
 		for i in range(n):
@@ -312,8 +326,8 @@ if not env.GetOption('clean'):
 			print("  If you're sure it's installed, try passing INCLUDEPATH=...")
 			Exit(1)
 
-	boost_versions = ['-1_54', '-1_55', '-1_56', '-1_57', '-1_58'] # This is a bit of a hack. :(
-	bundled_libs = []
+	boost_versions = ['-1_84'] # This is a bit of a hack. :(
+	suffixes = ['-mt', f'-mt-x{env["bits"]}']
 
 
 	check_header('boost/lexical_cast.hpp', 'Boost.LexicalCast')
@@ -322,8 +336,8 @@ if not env.GetOption('clean'):
 	check_header('boost/any.hpp', 'Boost.Any')
 	check_header('boost/math_fwd.hpp', 'Boost.Math')
 	check_header('boost/spirit/include/classic.hpp', 'Boost.Spirit.Classic')
-	check_lib('boost_system', 'Boost.System', ['-mt'], boost_versions)
-	check_lib('boost_filesystem', 'Boost.Filesystem', ['-mt'], boost_versions)
+	check_lib('boost_system', 'Boost.System', suffixes, boost_versions)
+	check_lib('boost_filesystem', 'Boost.Filesystem', suffixes, boost_versions)
 	check_lib('sfml-system', 'SFML-system')
 	check_lib('sfml-window', 'SFML-window')
 	check_lib('sfml-audio', 'SFML-audio')
@@ -362,6 +376,8 @@ env.Append(CPPDEFINES=["TIXML_USE_TICPP"])
 if platform == "win32":
 	# For the *resource.h headers
 	env.Append(CPPPATH=["#rsrc/menus"])
+	# Icons
+	env.Append(CPPPATH=["#rsrc/icons/win"])
 
 if platform == "darwin":
 	env.Append(LIBS=Split("""
@@ -422,14 +438,23 @@ if platform == "darwin":
 		binary = path.join(install_dir, targ + '.app', 'Contents/MacOS', targ)
 		env.Command(Dir(target_dir), binary, [Delete(target_dir), bundle_libraries_for])
 elif platform == "win32":
-	bundled_libs = Split("""
+	bundled_libs += Split("""
 		libsndfile-1
 		openal32
 		sfml-audio-2
 		sfml-graphics-2
 		sfml-system-2
 		sfml-window-2
 		zlib1
+		freetype
+		vorbis
+		vorbisfile
+		vorbisenc
+		ogg
+		FLAC
+		bz2
+		brotlidec
+		brotlicommon
 	""")
 	target_dirs = ["#build/Blades of Exile", "#build/test"]
 	for lib in bundled_libs:
@@ -447,22 +472,23 @@ elif platform == "win32":
 					break
 	# Extra: Microsoft redistributable libraries installer
 	if 'msvc' in env["TOOLS"]:
-		if path.exists("dep/VCRedistInstall.exe"):
+		if path.exists("deps/VCRedistInstall.exe"):
 			env.Install("build/Blades of Exile/", "dep/VCRedistInstall.exe")
 		else:
 			print("WARNING: Cannot find installer for the MSVC redistributable libraries for your version of Visual Studio.")
 			print("Please download it from Microsoft's website and place it at:")
-			print("      dep/VCRedistInstall.exe")
+			print("      deps/VCRedistInstall.exe")
 			# Create it so its lack doesn't cause makensis to break
 			# (Because the installer is an optional component.)
+			os.makedirs("build/Blades of Exile", exist_ok=True)
 			open("build/Blades of Exile/VCRedistInstall.exe", 'w').close()
 
 if platform == "darwin":
 	env.VariantDir("#build/pkg", "pkg/mac")
 	SConscript("build/pkg/SConscript")
-elif platform == "win32" and subprocess.call(['where', '/Q', 'makensis']) == 0:
-	env.VariantDir("#build/pkg", "pkg/win")
-	SConscript("build/pkg/SConscript")
+#elif platform == "win32" and subprocess.call(['where', '/Q', 'makensis']) == 0:
+#	env.VariantDir("#build/pkg", "pkg/win")
+#	SConscript("build/pkg/SConscript")
 
 # Cleanup
 

pkg/win/SConscript

@@ -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"])
 

pkg/win/gen-data.py

@@ -24,11 +24,11 @@
 }
 
 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}')) + '"')
 

src/game/boe.menus.win.cpp

@@ -4,13 +4,13 @@
 #include <sstream>
 #include <SFML/Graphics/RenderWindow.hpp>
 #include "boeresource.h"
-#include "universe.hpp"
+#include "../universe/universe.hpp"
 #include "boe.party.hpp"
 #include "boe.infodlg.hpp"
 #include "boe.consts.hpp"
 #include "spell.hpp"
-#include "winutil.hpp"
-#include "menu_accel.win.hpp"
+#include "../tools/winutil.hpp"
+#include "../tools/menu_accel.win.hpp"
 
 // Include this last because some #defines in the Windows headers cause compile errors in my headers.
 // Fortunately they're on symbols not used in this file, so this should work.
@@ -287,7 +287,7 @@ void showMenuBar() {
 	DrawMenuBar(mainPtr.getSystemHandle());
 }
 
-#include "cursors.hpp"
+#include "../tools/cursors.hpp"
 
 LRESULT CALLBACK menuProc(HWND handle, UINT message, WPARAM wParam, LPARAM lParam) {
 	MSG msg = {handle, message, wParam, lParam};
@@ -313,7 +313,7 @@ LRESULT CALLBACK menuProc(HWND handle, UINT message, WPARAM wParam, LPARAM lPara
 	return CallWindowProc(reinterpret_cast<WNDPROC>(mainProc), handle, message, wParam, lParam);
 }
 
-#include "fileio.hpp"
+#include "../fileio/fileio.hpp"
 #include "boe.graphics.hpp"
 #include "boe.actions.hpp"
 #include "boe.fileio.hpp"

src/spell.hpp

@@ -10,6 +10,7 @@
 #define BoE_DATA_SPELL_HPP
 
 #include <map>
+#include <string>
 #include "skills_traits.hpp"
 
 // This controls how a spell is cast in combat; YES means it's the same as in town, IMMED means it has a special implementation in town, and TARGET / FANCY both mean it requires target selection.

test/SConscript

@@ -11,7 +11,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{env["bits"]}')
 else:
 	test = env.Program("#build/bin/boe_test", test_sources + party_classes + common_sources)