From d326b48582069e61b2c1a3ce7e454df66063b061 Mon Sep 17 00:00:00 2001 From: Unreal Karaulov Date: Wed, 25 Dec 2024 13:22:22 +0300 Subject: [PATCH] Test XP new --- .github/workflows/build.yml | 2 +- .../projects/msvc2022/angelscript.vcxproj | 154 ------------ vs-project/bspguy.sln | 18 -- vs-project/bspguy.vcxproj | 225 ------------------ vs-project/bspguy.vcxproj.user | 8 - vs-project/fmt/fmt.vcxproj | 125 ---------- vs-project/glfw/src/glfw.vcxproj | 137 ----------- 7 files changed, 1 insertion(+), 668 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 13cdc6fb..d918bf30 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -186,7 +186,7 @@ jobs: arch: Win32 - name: Build XP run: | - msbuild ${{ env.solution }} -m /p:Configuration=ReleaseXP_git /p:Platform=Win32 + msbuild ${{ env.solution }} -m /p:Configuration=ReleaseXPx86 /p:Platform=Win32 - name: Create Windows release WinXP archive run: > mkdir -p build\win32_release diff --git a/ascript/angelscript/projects/msvc2022/angelscript.vcxproj b/ascript/angelscript/projects/msvc2022/angelscript.vcxproj index 22a2d0f4..63b60f30 100644 --- a/ascript/angelscript/projects/msvc2022/angelscript.vcxproj +++ b/ascript/angelscript/projects/msvc2022/angelscript.vcxproj @@ -65,22 +65,6 @@ Release x64 - - ReleasXP_git - ARM - - - ReleasXP_git - ARM64 - - - ReleasXP_git - Win32 - - - ReleasXP_git - x64 - {39E6AF97-6BA3-4A72-8C61-BCEBF214EBFD} @@ -96,10 +80,6 @@ StaticLibrary v141_xp - - StaticLibrary - v141_xp - StaticLibrary v143 @@ -108,10 +88,6 @@ StaticLibrary v143 - - StaticLibrary - v143 - StaticLibrary v143 @@ -120,10 +96,6 @@ StaticLibrary v143 - - StaticLibrary - v143 - StaticLibrary NotSet @@ -136,12 +108,6 @@ true v143 - - StaticLibrary - NotSet - true - v143 - StaticLibrary true @@ -199,36 +165,24 @@ - - - - - - - - - - - - @@ -264,13 +218,10 @@ $(Configuration)\ ../../lib\ ../../lib\ - ../../lib\ ../../lib\ ../../lib\ - ../../lib\ $(Configuration)\ $(Configuration)XP\ - $(Configuration)XP\ $(ProjectName)64d $(ProjectName)64d $(ProjectName)d @@ -281,7 +232,6 @@ $(ProjectName)d_arm64 $(ProjectName)64 $(ProjectName)64 - $(ProjectName)64 $(ProjectName)_arm @@ -291,10 +241,6 @@ $(ProjectName)_arm ..\..\lib\ - - $(ProjectName)_arm - ..\..\lib\ - $(ProjectName)_arm64 ..\..\lib\ @@ -303,10 +249,6 @@ $(ProjectName)_arm64 ..\..\lib\ - - $(ProjectName)_arm64 - ..\..\lib\ - ..\..\lib\ @@ -327,22 +269,12 @@ false NativeMinimumRules.ruleset - - false - NativeMinimumRules.ruleset - XP.lib $(VC_IncludePath);$(WindowsSdk_71A_IncludePath); $(WindowsSdk_71A_LibraryPath_x86);$(VC_LibraryPath_x86);$(LibraryPath) $(WindowsSDK_ExecutablePath);$(WindowsSDK_IncludePath);$(WindowsSDK_LibraryPath_x86);$(WindowsSDK_LibraryPath);$(WindowsSDK_LibraryPath_x64);C:\Program Files (x86)\Windows Kits\10\Include\10.0.22621.0\shared\;C:\Program Files (x86)\Windows Kits\10\;$(ExcludePath) - - XP.lib - $(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - $(WindowsSdk_71A_LibraryPath_x86);$(VC_LibraryPath_x86);$(LibraryPath) - $(WindowsSDK_ExecutablePath);$(WindowsSDK_IncludePath);$(WindowsSDK_LibraryPath_x86);$(WindowsSDK_LibraryPath);$(WindowsSDK_LibraryPath_x64);C:\Program Files (x86)\Windows Kits\10\Include\10.0.22621.0\shared\;C:\Program Files (x86)\Windows Kits\10\;$(ExcludePath) - Disabled @@ -536,28 +468,6 @@ Windows - - - true - ANGELSCRIPT_EXPORT;WIN32;NDEBUG;_LIB;_WIN32_WINNT=0x0501;WINVER=0x0501;NTDDI_VERSION=0x05010100;_WIN32_IE_ 0x0501;VC_EXTRALEAN;_ATL_XP_TARGETING;WIN32_LEAN_AND_MEAN;PSAPI_VERSION=1;%(PreprocessorDefinitions) - true - Sync - MultiThreaded - - - false - Level3 - Full - AnySuitable - Speed - StreamingSIMDExtensions2 - Fast - false - - - Windows - - true @@ -592,23 +502,6 @@ Fast - - - true - ANGELSCRIPT_EXPORT;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - Sync - false - false - Level3 - Full - AnySuitable - Speed - - - Fast - - true @@ -643,23 +536,6 @@ Fast - - - true - ANGELSCRIPT_EXPORT;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - Sync - false - false - Level3 - Full - AnySuitable - Speed - - - Fast - - true @@ -708,30 +584,6 @@ ..\..\lib\angelscript64.lib - - - true - ANGELSCRIPT_EXPORT;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - Sync - MultiThreaded - false - false - Level4 - MaxSpeed - AnySuitable - true - Speed - - - Fast - - - - - ..\..\lib\angelscript64.lib - - @@ -819,10 +671,8 @@ Document ml64.exe /c /nologo /Fo"$(Configuration)\as_callfunc_x64_msvc_asm.obj" /W3 /Zi /Ta "%(RootDir)%(Directory)\%(Filename)%(Extension)" ml64.exe /c /nologo /Fo"$(Configuration)\as_callfunc_x64_msvc_asm.obj" /W3 /Zi /Ta "%(RootDir)%(Directory)\%(Filename)%(Extension)" - ml64.exe /c /nologo /Fo"$(Configuration)\as_callfunc_x64_msvc_asm.obj" /W3 /Zi /Ta "%(RootDir)%(Directory)\%(Filename)%(Extension)" $(Configuration)\as_callfunc_x64_msvc_asm.obj;%(Outputs) $(Configuration)\as_callfunc_x64_msvc_asm.obj;%(Outputs) - $(Configuration)\as_callfunc_x64_msvc_asm.obj;%(Outputs) ml64.exe /c /nologo /Fo"$(Configuration)\as_callfunc_x64_msvc_asm.obj" /W3 /Zi /Ta "%(RootDir)%(Directory)\%(Filename)%(Extension)" ml64.exe /c /nologo /Fo"$(Configuration)\as_callfunc_x64_msvc_asm.obj" /W3 /Zi /Ta "%(RootDir)%(Directory)\%(Filename)%(Extension)" $(Configuration)\as_callfunc_x64_msvc_asm.obj;%(Outputs) @@ -836,12 +686,10 @@ armasm64.exe -g -o "$(Platform)\$(Configuration)\as_callfunc_arm64_msvc.obj" "%(RootDir)%(Directory)\%(Filename)%(Extension)" armasm64.exe -o "$(Platform)\$(Configuration)\as_callfunc_arm64_msvc.obj" "%(RootDir)%(Directory)\%(Filename)%(Extension)" armasm64.exe -o "$(Platform)\$(Configuration)\as_callfunc_arm64_msvc.obj" "%(RootDir)%(Directory)\%(Filename)%(Extension)" - armasm64.exe -o "$(Platform)\$(Configuration)\as_callfunc_arm64_msvc.obj" "%(RootDir)%(Directory)\%(Filename)%(Extension)" $(Platform)\$(Configuration)\as_callfunc_arm64_msvc.obj;%(Outputs) $(Platform)\$(Configuration)\as_callfunc_arm64_msvc.obj;%(Outputs) $(Platform)\$(Configuration)\as_callfunc_arm64_msvc.obj;%(Outputs) $(Platform)\$(Configuration)\as_callfunc_arm64_msvc.obj;%(Outputs) - $(Platform)\$(Configuration)\as_callfunc_arm64_msvc.obj;%(Outputs) @@ -854,10 +702,8 @@ $(Platform)\$(Configuration)\as_callfunc_arm_msvc.obj;%(Outputs) armasm.exe -32 -o "$(Platform)\$(Configuration)\as_callfunc_arm_msvc.obj" "%(RootDir)%(Directory)\%(Filename)%(Extension)" armasm.exe -32 -o "$(Platform)\$(Configuration)\as_callfunc_arm_msvc.obj" "%(RootDir)%(Directory)\%(Filename)%(Extension)" - armasm.exe -32 -o "$(Platform)\$(Configuration)\as_callfunc_arm_msvc.obj" "%(RootDir)%(Directory)\%(Filename)%(Extension)" $(Platform)\$(Configuration)\as_callfunc_arm_msvc.obj;%(Outputs) $(Platform)\$(Configuration)\as_callfunc_arm_msvc.obj;%(Outputs) - $(Platform)\$(Configuration)\as_callfunc_arm_msvc.obj;%(Outputs) diff --git a/vs-project/bspguy.sln b/vs-project/bspguy.sln index 871050b5..7a69d883 100644 --- a/vs-project/bspguy.sln +++ b/vs-project/bspguy.sln @@ -26,8 +26,6 @@ Global Release|x64 = Release|x64 ReleaseXPx86|Win32 = ReleaseXPx86|Win32 ReleaseXPx86|x64 = ReleaseXPx86|x64 - ReleasXP_git|Win32 = ReleasXP_git|Win32 - ReleasXP_git|x64 = ReleasXP_git|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {B66A4AE9-1BB7-3A0F-89E2-535DB5F7A262}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -46,10 +44,6 @@ Global {B66A4AE9-1BB7-3A0F-89E2-535DB5F7A262}.ReleaseXPx86|Win32.Build.0 = ReleaseXPx86|Win32 {B66A4AE9-1BB7-3A0F-89E2-535DB5F7A262}.ReleaseXPx86|x64.ActiveCfg = ReleaseXPx86|x64 {B66A4AE9-1BB7-3A0F-89E2-535DB5F7A262}.ReleaseXPx86|x64.Build.0 = ReleaseXPx86|x64 - {B66A4AE9-1BB7-3A0F-89E2-535DB5F7A262}.ReleasXP_git|Win32.ActiveCfg = ReleasXP_git|Win32 - {B66A4AE9-1BB7-3A0F-89E2-535DB5F7A262}.ReleasXP_git|Win32.Build.0 = ReleasXP_git|Win32 - {B66A4AE9-1BB7-3A0F-89E2-535DB5F7A262}.ReleasXP_git|x64.ActiveCfg = ReleasXP_git|x64 - {B66A4AE9-1BB7-3A0F-89E2-535DB5F7A262}.ReleasXP_git|x64.Build.0 = ReleasXP_git|x64 {94C10DCA-6ED7-3AC5-87DF-14B22017E799}.Debug|Win32.ActiveCfg = Debug|Win32 {94C10DCA-6ED7-3AC5-87DF-14B22017E799}.Debug|Win32.Build.0 = Debug|Win32 {94C10DCA-6ED7-3AC5-87DF-14B22017E799}.Debug|x64.ActiveCfg = Debug|x64 @@ -66,10 +60,6 @@ Global {94C10DCA-6ED7-3AC5-87DF-14B22017E799}.ReleaseXPx86|Win32.Build.0 = ReleaseXPx86|Win32 {94C10DCA-6ED7-3AC5-87DF-14B22017E799}.ReleaseXPx86|x64.ActiveCfg = ReleaseXPx86|x64 {94C10DCA-6ED7-3AC5-87DF-14B22017E799}.ReleaseXPx86|x64.Build.0 = ReleaseXPx86|x64 - {94C10DCA-6ED7-3AC5-87DF-14B22017E799}.ReleasXP_git|Win32.ActiveCfg = ReleasXP_git|Win32 - {94C10DCA-6ED7-3AC5-87DF-14B22017E799}.ReleasXP_git|Win32.Build.0 = ReleasXP_git|Win32 - {94C10DCA-6ED7-3AC5-87DF-14B22017E799}.ReleasXP_git|x64.ActiveCfg = ReleasXP_git|x64 - {94C10DCA-6ED7-3AC5-87DF-14B22017E799}.ReleasXP_git|x64.Build.0 = ReleasXP_git|x64 {FD691EA2-CABA-3BE3-8AD8-8BD2CBE64BCF}.Debug|Win32.ActiveCfg = Debug|Win32 {FD691EA2-CABA-3BE3-8AD8-8BD2CBE64BCF}.Debug|Win32.Build.0 = Debug|Win32 {FD691EA2-CABA-3BE3-8AD8-8BD2CBE64BCF}.Debug|x64.ActiveCfg = Debug|x64 @@ -86,10 +76,6 @@ Global {FD691EA2-CABA-3BE3-8AD8-8BD2CBE64BCF}.ReleaseXPx86|Win32.Build.0 = ReleaseXPx86|Win32 {FD691EA2-CABA-3BE3-8AD8-8BD2CBE64BCF}.ReleaseXPx86|x64.ActiveCfg = ReleaseXPx86|x64 {FD691EA2-CABA-3BE3-8AD8-8BD2CBE64BCF}.ReleaseXPx86|x64.Build.0 = ReleaseXPx86|x64 - {FD691EA2-CABA-3BE3-8AD8-8BD2CBE64BCF}.ReleasXP_git|Win32.ActiveCfg = ReleasXP_git|Win32 - {FD691EA2-CABA-3BE3-8AD8-8BD2CBE64BCF}.ReleasXP_git|Win32.Build.0 = ReleasXP_git|Win32 - {FD691EA2-CABA-3BE3-8AD8-8BD2CBE64BCF}.ReleasXP_git|x64.ActiveCfg = ReleasXP_git|x64 - {FD691EA2-CABA-3BE3-8AD8-8BD2CBE64BCF}.ReleasXP_git|x64.Build.0 = ReleasXP_git|x64 {39E6AF97-6BA3-4A72-8C61-BCEBF214EBFD}.Debug|Win32.ActiveCfg = Debug|Win32 {39E6AF97-6BA3-4A72-8C61-BCEBF214EBFD}.Debug|Win32.Build.0 = Debug|Win32 {39E6AF97-6BA3-4A72-8C61-BCEBF214EBFD}.Debug|x64.ActiveCfg = Debug|x64 @@ -106,10 +92,6 @@ Global {39E6AF97-6BA3-4A72-8C61-BCEBF214EBFD}.ReleaseXPx86|Win32.Build.0 = ReleaseXPx86|Win32 {39E6AF97-6BA3-4A72-8C61-BCEBF214EBFD}.ReleaseXPx86|x64.ActiveCfg = ReleaseXPx86|x64 {39E6AF97-6BA3-4A72-8C61-BCEBF214EBFD}.ReleaseXPx86|x64.Build.0 = ReleaseXPx86|x64 - {39E6AF97-6BA3-4A72-8C61-BCEBF214EBFD}.ReleasXP_git|Win32.ActiveCfg = ReleasXP_git|ARM - {39E6AF97-6BA3-4A72-8C61-BCEBF214EBFD}.ReleasXP_git|Win32.Build.0 = ReleasXP_git|ARM - {39E6AF97-6BA3-4A72-8C61-BCEBF214EBFD}.ReleasXP_git|x64.ActiveCfg = ReleasXP_git|x64 - {39E6AF97-6BA3-4A72-8C61-BCEBF214EBFD}.ReleasXP_git|x64.Build.0 = ReleasXP_git|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/vs-project/bspguy.vcxproj b/vs-project/bspguy.vcxproj index b29685b9..5aed0de7 100644 --- a/vs-project/bspguy.vcxproj +++ b/vs-project/bspguy.vcxproj @@ -36,14 +36,6 @@ Release x64 - - ReleasXP_git - Win32 - - - ReleasXP_git - x64 - {B66A4AE9-1BB7-3A0F-89E2-535DB5F7A262} @@ -98,12 +90,6 @@ v141_xp false - - Application - MultiByte - v141_xp - false - Application MultiByte @@ -111,13 +97,6 @@ false true - - Application - MultiByte - v141_xp - false - true - @@ -149,35 +128,25 @@ true .\..\vs-project\Release\ .\..\vs-project\Release\ - .\..\vs-project\Release\ bspguy.dir\Release\ bspguy.dir\Release\ - bspguy.dir\Release\ bspguy bspguy bspguy - bspguy bspguy - bspguy .exe .exe .exe - .exe .exe - .exe - - true true true - true true - true $(VC_ExecutablePath_x86);$(WindowsSdk_71A_ExecutablePath);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH); @@ -188,14 +157,6 @@ - - $(VC_ExecutablePath_x86);$(WindowsSdk_71A_ExecutablePath);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH); - $(VC_ReferencesPath_x86); - $(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); - $(VC_IncludePath);$(WindowsSdk_71A_IncludePath);$(VC_ExecutablePath_x86);$(WindowsSdk_71A_ExecutablePath);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x86);$(SystemRoot) - $(VC_IncludePath);$(WindowsSDK_IncludePath);. - - $(VC_IncludePath);$(WindowsSdk_71A_IncludePath); @@ -204,14 +165,6 @@ .\..\vs-project\Release\ $(WindowsSDK_ExecutablePath);$(WindowsSDK_IncludePath);$(WindowsSDK_LibraryPath_x86);$(WindowsSDK_LibraryPath);$(WindowsSDK_LibraryPath_x64);C:\Program Files (x86)\Windows Kits\10\Include\10.0.22621.0\shared\;C:\Program Files (x86)\Windows Kits\10\;$(ExcludePath) - - - $(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - $(WindowsSdk_71A_LibraryPath_x86);$(VC_LibraryPath_x86);$(LibraryPath) - bspguy.dir\ReleaseXP\ - .\..\vs-project\Release\ - $(WindowsSDK_ExecutablePath);$(WindowsSDK_IncludePath);$(WindowsSDK_LibraryPath_x86);$(WindowsSDK_LibraryPath);$(WindowsSDK_LibraryPath_x64);C:\Program Files (x86)\Windows Kits\10\Include\10.0.22621.0\shared\;C:\Program Files (x86)\Windows Kits\10\;$(ExcludePath) - false @@ -786,95 +739,6 @@ del "$(TargetDir)bspguy.cfg_bak" xcopy /I /E /Y "$(SolutionDir)..\resources\*" "$(TargetDir)" del "$(TargetDir)bspguy.ini" copy "$(TargetDir)bspguy.ini_bak" "$(TargetDir)bspguy.ini" -del "$(TargetDir)bspguy.ini_bak" - - - - - .\..\src;.\..\src\bsp;.\..\src\res;.\..\src\cli;.\..\src\data;.\..\src\editor;.\..\src\filedialog;.\..\src\gl;.\..\src\qtools;.\..\src\util;.\..\src\nav;.\..\src\mdl;.\..\imgui;.\..\imgui\examples;.\..\imgui\backends;.\..\imgui\misc\cpp;.\..\glew\include;.\..\glfw\include;.\..\fmt\include;.\..\ascript\angelscript\include;%(AdditionalIncludeDirectories) - $(IntDir) - - - Sync - OnlyExplicitInline - Custom - NotUsing - MultiThreaded - true - false - Level4 - %(PreprocessorDefinitions);WIN32;WIN_XP_86;_WINDOWS;NDEBUG;GLEW_STATIC;NOMINMAX;_WIN32_WINNT=0x0501;WINVER=0x0501;NTDDI_VERSION=0x05010000 -;VC_EXTRALEAN;_ATL_XP_TARGETING;WIN32_LEAN_AND_MEAN;PSAPI_VERSION=1;_CRT_SECURE_NO_WARNINGS;GLEW_NO_GLU; - $(IntDir) - - - stdcpplatest - false - true - Size - true - - - Cdecl - true - false - - - true - - - - - true - /wd4100 /utf-8 %(AdditionalOptions) - true - StreamingSIMDExtensions2 - - - %(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG;GLEW_STATIC; - .\..\src;.\..\src\bsp;.\..\src\res;.\..\src\cli;.\..\src\data;.\..\src\editor;.\..\src\filedialog;.\..\src\gl;.\..\src\qtools;.\..\src\util;.\..\src\nav;.\..\src\mdl;.\..\imgui;.\..\imgui\examples;.\..\imgui\backends;.\..\imgui\misc\cpp;.\..\glew\include;.\..\glfw\include;%(AdditionalIncludeDirectories) - - - .\..\src;.\..\src\bsp;.\..\src\res;.\..\src\cli;.\..\src\data;.\..\src\editor;.\..\src\filedialog;.\..\src\gl;.\..\src\qtools;.\..\src\util;.\..\src\nav;.\..\src\mdl;.\..\imgui;.\..\imgui\examples;.\..\imgui\backends;.\..\imgui\misc\cpp;.\..\glew\include;.\..\glfw\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) - %(Filename).h - %(Filename).tlb - %(Filename)_i.c - %(Filename)_p.c - - - glfw\src\Release\glfw3.lib;fmt\fmt\Release\fmt.lib;opengl32.lib;..\glew\lib\Release\Win32\glew32s.lib;..\ascript\angelscript\lib\angelscript64.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;..\ascript\angelscript\lib\angelscript64.lib - %(AdditionalLibraryDirectories) - %(AdditionalOptions) - true - %(IgnoreSpecificDefaultLibraries) - Release/bspguy.lib - Release/bspguy.pdb - Console - true - - - - - - - false - false - - - false - MachineX86 - 5.01 - - - - - - - copy "$(TargetDir)bspguy.ini" "$(TargetDir)bspguy.ini_bak" -xcopy /I /E /Y "$(SolutionDir)..\resources\*" "$(TargetDir)" -del "$(TargetDir)bspguy.ini" -copy "$(TargetDir)bspguy.ini_bak" "$(TargetDir)bspguy.ini" del "$(TargetDir)bspguy.ini_bak" @@ -963,95 +827,6 @@ del "$(TargetDir)bspguy.ini_bak" xcopy /I /E /Y "$(SolutionDir)..\resources\*" "$(TargetDir)" del "$(TargetDir)bspguy.cfg" copy "$(TargetDir)bspguy.cfg_bak" "$(TargetDir)bspguy.cfg" -del "$(TargetDir)bspguy.cfg_bak" - - - - - .\..\src;.\..\src\bsp;.\..\src\res;.\..\src\cli;.\..\src\data;.\..\src\editor;.\..\src\filedialog;.\..\src\gl;.\..\src\qtools;.\..\src\util;.\..\src\nav;.\..\src\mdl;.\..\imgui;.\..\imgui\examples;.\..\imgui\backends;.\..\imgui\misc\cpp;.\..\glew\include;.\..\glfw\include;.\..\fmt\include;.\..\ascript\angelscript\include;%(AdditionalIncludeDirectories) - $(IntDir) - - - Sync - OnlyExplicitInline - Custom - NotUsing - MultiThreaded - true - false - Level4 - %(PreprocessorDefinitions);WIN32;WIN_XP_86;_WINDOWS;NDEBUG;GLEW_STATIC;NOMINMAX;_WIN32_WINNT=0x0501;WINVER=0x0501;NTDDI_VERSION=0x05010100;VC_EXTRALEAN;_ATL_XP_TARGETING;WIN32_LEAN_AND_MEAN;PSAPI_VERSION=1;_CRT_SECURE_NO_WARNINGS;GLEW_NO_GLU - $(IntDir) - - - stdcpplatest - false - true - Size - true - - - Cdecl - true - false - - - true - - - - - true - /wd4100 /utf-8 %(AdditionalOptions) - true - StreamingSIMDExtensions2 - - - - - %(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG;GLEW_STATIC; - .\..\src;.\..\src\bsp;.\..\src\res;.\..\src\cli;.\..\src\data;.\..\src\editor;.\..\src\filedialog;.\..\src\gl;.\..\src\qtools;.\..\src\util;.\..\src\mdl;.\..\src\nav;.\..\imgui;.\..\imgui\examples;.\..\imgui\backends;.\..\imgui\misc\cpp;.\..\glew\include;.\..\glfw\include;%(AdditionalIncludeDirectories) - - - .\..\src;.\..\src\bsp;.\..\src\res;.\..\src\cli;.\..\src\data;.\..\src\editor;.\..\src\filedialog;.\..\src\gl;.\..\src\qtools;.\..\src\util;.\..\src\mdl;.\..\src\nav;.\..\imgui;.\..\imgui\examples;.\..\imgui\backends;.\..\imgui\misc\cpp;.\..\glew\include;.\..\glfw\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) - %(Filename).h - %(Filename).tlb - %(Filename)_i.c - %(Filename)_p.c - - - glfw\src\ReleaseXPx86\glfw3.lib;fmt\fmt\ReleaseXPx86\fmt.lib;opengl32.lib;..\glew\lib\Release\Win32\glew32s.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib;..\ascript\angelscript\lib\angelscriptXP.lib - %(AdditionalLibraryDirectories) - %(AdditionalOptions) - true - %(IgnoreSpecificDefaultLibraries) - Release/bspguy.lib - Release/bspguy.pdb - Console - true - - - - - - - false - false - - - false - 5.01 - - - - - - - copy "$(TargetDir)bspguy.cfg" "$(TargetDir)bspguy.cfg_bak" -xcopy /I /E /Y "$(SolutionDir)..\resources\*" "$(TargetDir)" -del "$(TargetDir)bspguy.cfg" -copy "$(TargetDir)bspguy.cfg_bak" "$(TargetDir)bspguy.cfg" del "$(TargetDir)bspguy.cfg_bak" diff --git a/vs-project/bspguy.vcxproj.user b/vs-project/bspguy.vcxproj.user index 17db99da..f7a2d6fc 100644 --- a/vs-project/bspguy.vcxproj.user +++ b/vs-project/bspguy.vcxproj.user @@ -32,16 +32,8 @@ "d:\SteamLibrary\steamapps\common\Half-Life\cstrike\maps\de_dust2.bsp" WindowsLocalDebugger - - "d:\SteamLibrary\steamapps\common\Half-Life\cstrike\maps\de_dust2.bsp" - WindowsLocalDebugger - "d:\SteamLibrary\steamapps\common\Half-Life\cstrike\maps\de_dust2.bsp" WindowsLocalDebugger - - "d:\SteamLibrary\steamapps\common\Half-Life\cstrike\maps\de_dust2.bsp" - WindowsLocalDebugger - \ No newline at end of file diff --git a/vs-project/fmt/fmt.vcxproj b/vs-project/fmt/fmt.vcxproj index 18d5d41b..f7f5b569 100644 --- a/vs-project/fmt/fmt.vcxproj +++ b/vs-project/fmt/fmt.vcxproj @@ -37,14 +37,6 @@ Release x64 - - ReleasXP_git - Win32 - - - ReleasXP_git - x64 - {FD691EA2-CABA-3BE3-8AD8-8BD2CBE64BCF} @@ -90,21 +82,11 @@ MultiByte v143 - - StaticLibrary - MultiByte - v143 - StaticLibrary MultiByte v141_xp - - StaticLibrary - MultiByte - v141_xp - @@ -128,22 +110,16 @@ .lib .\fmt\Release\ .\fmt\Release\ - .\fmt\Release\ fmt.dir\Release\ fmt.dir\Release\ - fmt.dir\Release\ fmt fmt fmt - fmt fmt - fmt .lib .lib .lib - .lib .lib - .lib $(VC_ExecutablePath_x86);$(CommonExecutablePath) @@ -151,12 +127,6 @@ $(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86) $(CommonExcludePath);$(VC_ExecutablePath_x86);$(VC_LibraryPath_x86) - - $(VC_ExecutablePath_x86);$(CommonExecutablePath) - $(VC_ReferencesPath_x86); - $(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86) - $(CommonExcludePath);$(VC_ExecutablePath_x86);$(VC_LibraryPath_x86) - $(VC_ExecutablePath_x86);$(CommonExecutablePath) $(WindowsSdk_71A_LibraryPath_x86);$(VC_LibraryPath_x86);$(LibraryPath) @@ -165,14 +135,6 @@ fmt.dir\ReleaseXP\ $(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - - $(VC_ExecutablePath_x86);$(CommonExecutablePath) - $(WindowsSdk_71A_LibraryPath_x86);$(VC_LibraryPath_x86);$(LibraryPath) - $(WindowsSDK_ExecutablePath);$(WindowsSDK_IncludePath);$(WindowsSDK_LibraryPath_x86);$(WindowsSDK_LibraryPath);$(WindowsSDK_LibraryPath_x64);C:\Program Files (x86)\Windows Kits\10\Include\10.0.22621.0\shared\;C:\Program Files (x86)\Windows Kits\10\;$(ExcludePath) - .\fmt\ReleaseXPx86\ - fmt.dir\ReleaseXP\ - $(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - fmt.dir\Debug\ .\fmt\Debug\ @@ -456,49 +418,6 @@ MachineX86 - - - .\..\..\src;.\..\..\src\bsp;.\..\..\src\cli;.\..\..\src\data;.\..\..\src\editor;.\..\..\src\filedialog;.\..\..\src\gl;.\..\..\src\qtools;.\..\..\src\util;.\..\..\src\mdl;.\..\..\imgui;.\..\..\imgui\examples;.\..\..\imgui\misc\cpp;.\..\..\imgui\backends;.\..\..\fmt;.\..\..\fmt\include;.\..\..\glew\include;%(AdditionalIncludeDirectories) - $(IntDir) - Sync - OnlyExplicitInline - Custom - NotUsing - MultiThreaded - false - %(PreprocessorDefinitions);WIN32;WIN_XP_86;_WINDOWS;NDEBUG;GLEW_STATIC; - $(IntDir) - - - true - Size - true - true - NotSet - false - true - false - true - true - /utf-8 %(AdditionalOptions) - - - %(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG;GLEW_STATIC; - .\..\..\src;.\..\..\src\bsp;.\..\..\src\cli;.\..\..\src\data;.\..\..\src\editor;.\..\..\src\filedialog;.\..\..\src\gl;.\..\..\src\qtools;.\..\..\src\util;.\..\..\src\mdl;.\..\..\imgui;.\..\..\imgui\examples;.\..\..\imgui\misc\cpp;.\..\..\imgui\backends;.\..\..\fmt;.\..\..\fmt\include;.\..\..\glew\include;%(AdditionalIncludeDirectories) - - - .\..\..\src;.\..\..\src\bsp;.\..\..\src\cli;.\..\..\src\data;.\..\..\src\editor;.\..\..\src\filedialog;.\..\..\src\gl;.\..\..\src\qtools;.\..\..\src\util;.\..\..\src\mdl;.\..\..\imgui;.\..\..\imgui\examples;.\..\..\imgui\misc\cpp;.\..\..\imgui\backends;.\..\..\fmt;.\..\..\fmt\include;.\..\..\glew\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) - %(Filename).h - %(Filename).tlb - %(Filename)_i.c - %(Filename)_p.c - - - %(AdditionalOptions) /machine:x86 - MachineX86 - - .\..\..\src;.\..\..\src\bsp;.\..\..\src\cli;.\..\..\src\data;.\..\..\src\editor;.\..\..\src\filedialog;.\..\..\src\gl;.\..\..\src\qtools;.\..\..\src\util;.\..\..\src\mdl;.\..\..\imgui;.\..\..\imgui\examples;.\..\..\imgui\misc\cpp;.\..\..\imgui\backends;.\..\..\fmt;.\..\..\fmt\include;.\..\..\glew\include;%(AdditionalIncludeDirectories) @@ -543,50 +462,6 @@ MachineX86 - - - .\..\..\src;.\..\..\src\bsp;.\..\..\src\cli;.\..\..\src\data;.\..\..\src\editor;.\..\..\src\filedialog;.\..\..\src\gl;.\..\..\src\qtools;.\..\..\src\util;.\..\..\src\mdl;.\..\..\imgui;.\..\..\imgui\examples;.\..\..\imgui\misc\cpp;.\..\..\imgui\backends;.\..\..\fmt;.\..\..\fmt\include;.\..\..\glew\include;%(AdditionalIncludeDirectories) - $(IntDir) - Sync - OnlyExplicitInline - Custom - NotUsing - MultiThreaded - false - %(PreprocessorDefinitions);WIN32;WIN_XP_86;_WINDOWS;NDEBUG;GLEW_STATIC;_WIN32_WINNT=0x0501;WINVER=0x0501;NTDDI_VERSION=0x05010100;VC_EXTRALEAN;_ATL_XP_TARGETING;WIN32_LEAN_AND_MEAN;PSAPI_VERSION=1 - $(IntDir) - - - true - Size - true - true - NotSet - - - true - false - true - true - /utf-8 %(AdditionalOptions) - - - %(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG;GLEW_STATIC; - .\..\..\src;.\..\..\src\bsp;.\..\..\src\cli;.\..\..\src\data;.\..\..\src\editor;.\..\..\src\filedialog;.\..\..\src\gl;.\..\..\src\qtools;.\..\..\src\util;.\..\..\src\mdl;.\..\..\imgui;.\..\..\imgui\examples;.\..\..\imgui\misc\cpp;.\..\..\imgui\backends;.\..\..\fmt;.\..\..\fmt\include;.\..\..\glew\include;%(AdditionalIncludeDirectories) - - - .\..\..\src;.\..\..\src\bsp;.\..\..\src\cli;.\..\..\src\data;.\..\..\src\editor;.\..\..\src\filedialog;.\..\..\src\gl;.\..\..\src\qtools;.\..\..\src\util;.\..\..\src\mdl;.\..\..\imgui;.\..\..\imgui\examples;.\..\..\imgui\misc\cpp;.\..\..\imgui\backends;.\..\..\fmt;.\..\..\fmt\include;.\..\..\glew\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) - %(Filename).h - %(Filename).tlb - %(Filename)_i.c - %(Filename)_p.c - - - %(AdditionalOptions) /machine:x86 - MachineX86 - - diff --git a/vs-project/glfw/src/glfw.vcxproj b/vs-project/glfw/src/glfw.vcxproj index f41184bb..686ad032 100644 --- a/vs-project/glfw/src/glfw.vcxproj +++ b/vs-project/glfw/src/glfw.vcxproj @@ -37,14 +37,6 @@ Release x64 - - ReleasXP_git - Win32 - - - ReleasXP_git - x64 - {94C10DCA-6ED7-3AC5-87DF-14B22017E799} @@ -90,23 +82,12 @@ Unicode v143 - - StaticLibrary - Unicode - v143 - StaticLibrary Unicode v141_xp false - - StaticLibrary - Unicode - v141_xp - false - StaticLibrary Unicode @@ -153,22 +134,16 @@ .lib .\..\..\..\vs-project\glfw\src\Release\ .\..\..\..\vs-project\glfw\src\ReleaseXP\ - .\..\..\..\vs-project\glfw\src\ReleaseXP\ glfw.dir\Release\ glfw.dir\ReleaseXP\ - glfw.dir\ReleaseXP\ glfw3 glfw3 glfw3 - glfw3 glfw3 - glfw3 .lib .lib .lib - .lib .lib - .lib .\..\..\..\vs-project\glfw\src\MinSizeRel\ glfw.dir\MinSizeRel\ glfw3 @@ -189,13 +164,6 @@ $(VC_IncludePath);$(WindowsSdk_71A_IncludePath);$(VC_ExecutablePath_x86);$(WindowsSdk_71A_ExecutablePath);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x86);$(SystemRoot) $(VC_IncludePath);$(WindowsSDK_IncludePath);. - - $(VC_ExecutablePath_x86);$(WindowsSdk_71A_ExecutablePath);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH); - $(VC_ReferencesPath_x86); - $(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86); - $(VC_IncludePath);$(WindowsSdk_71A_IncludePath);$(VC_ExecutablePath_x86);$(WindowsSdk_71A_ExecutablePath);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x86);$(SystemRoot) - $(VC_IncludePath);$(WindowsSDK_IncludePath);. - $(VC_ExecutablePath_x86);$(WindowsSdk_71A_ExecutablePath);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH); $(WindowsSdk_71A_LibraryPath_x86);$(VC_LibraryPath_x86);$(LibraryPath) @@ -204,14 +172,6 @@ glfw.dir\ReleaseXP\ $(WindowsSDK_ExecutablePath);$(WindowsSDK_IncludePath);$(WindowsSDK_LibraryPath_x86);$(WindowsSDK_LibraryPath);$(WindowsSDK_LibraryPath_x64);C:\Program Files (x86)\Windows Kits\10\Include\10.0.22621.0\shared\;C:\Program Files (x86)\Windows Kits\10\;$(ExcludePath) - - $(VC_ExecutablePath_x86);$(WindowsSdk_71A_ExecutablePath);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH); - $(WindowsSdk_71A_LibraryPath_x86);$(VC_LibraryPath_x86);$(LibraryPath) - $(VC_IncludePath);$(WindowsSdk_71A_IncludePath); - .\..\..\..\vs-project\glfw\src\ReleaseXPx86\ - glfw.dir\ReleaseXP\ - $(WindowsSDK_ExecutablePath);$(WindowsSDK_IncludePath);$(WindowsSDK_LibraryPath_x86);$(WindowsSDK_LibraryPath);$(WindowsSDK_LibraryPath_x64);C:\Program Files (x86)\Windows Kits\10\Include\10.0.22621.0\shared\;C:\Program Files (x86)\Windows Kits\10\;$(ExcludePath) - glfw.dir\Debug\ @@ -509,54 +469,6 @@ MachineX86 - - - .\..\..\..\src;.\..\..\..\src\bsp;.\..\..\..\src\cli;.\..\..\..\src\data;.\..\..\..\src\editor;.\..\..\..\src\filedialog;.\..\..\..\src\gl;.\..\..\..\src\qtools;.\..\..\..\src\util;.\..\..\..\src\mdlviewer;.\..\..\..\imgui;.\..\..\..\imgui\examples;.\..\..\..\imgui\backends;.\..\..\..\glew\include;.\..\..\..\glfw\include;.\..\..\..\glfw\src;.\..\..\..\vs-project\glfw\src;%(AdditionalIncludeDirectories) - $(IntDir) - - - OnlyExplicitInline - Custom - NotUsing - MultiThreaded - false - Level3 - %(PreprocessorDefinitions);WIN32;WIN_XP_86;_WINDOWS;NDEBUG;_GLFW_WIN32;UNICODE;_UNICODE;_CRT_SECURE_NO_WARNINGS;GLEW_STATIC;OEMRESOURCE - $(IntDir) - - - stdcpplatest - true - Size - true - true - false - false - true - StreamingSIMDExtensions2 - true - true - /utf-8 %(AdditionalOptions) - Default - stdclatest - - - %(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG;_GLFW_WIN32;UNICODE;_UNICODE;_CRT_SECURE_NO_WARNINGS;GLEW_STATIC; - .\..\..\..\src;.\..\..\..\src\bsp;.\..\..\..\src\cli;.\..\..\..\src\data;.\..\..\..\src\editor;.\..\..\..\src\filedialog;.\..\..\..\src\gl;.\..\..\..\src\qtools;.\..\..\..\src\util;.\..\..\..\src\mdlviewer;.\..\..\..\imgui;.\..\..\..\imgui\examples;.\..\..\..\imgui\backends;.\..\..\..\glew\include;.\..\..\..\glfw\include;.\..\..\..\glfw\src;.\..\..\..\vs-project\glfw\src;%(AdditionalIncludeDirectories) - - - .\..\..\..\src;.\..\..\..\src\bsp;.\..\..\..\src\cli;.\..\..\..\src\data;.\..\..\..\src\editor;.\..\..\..\src\filedialog;.\..\..\..\src\gl;.\..\..\..\src\qtools;.\..\..\..\src\util;.\..\..\..\src\mdlviewer;.\..\..\..\imgui;.\..\..\..\imgui\examples;.\..\..\..\imgui\backends;.\..\..\..\glew\include;.\..\..\..\glfw\include;.\..\..\..\glfw\src;.\..\..\..\vs-project\glfw\src;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) - %(Filename).h - %(Filename).tlb - %(Filename)_i.c - %(Filename)_p.c - - - %(AdditionalOptions) /machine:x86 - MachineX86 - - .\..\..\..\src;.\..\..\..\src\bsp;.\..\..\..\src\cli;.\..\..\..\src\data;.\..\..\..\src\editor;.\..\..\..\src\filedialog;.\..\..\..\src\gl;.\..\..\..\src\qtools;.\..\..\..\src\util;.\..\..\..\src\mdlviewer;.\..\..\..\imgui;.\..\..\..\imgui\examples;.\..\..\..\imgui\backends;.\..\..\..\glew\include;.\..\..\..\glfw\include;.\..\..\..\glfw\src;.\..\..\..\vs-project\glfw\src;%(AdditionalIncludeDirectories) @@ -606,55 +518,6 @@ MachineX86 - - - .\..\..\..\src;.\..\..\..\src\bsp;.\..\..\..\src\cli;.\..\..\..\src\data;.\..\..\..\src\editor;.\..\..\..\src\filedialog;.\..\..\..\src\gl;.\..\..\..\src\qtools;.\..\..\..\src\util;.\..\..\..\src\mdlviewer;.\..\..\..\imgui;.\..\..\..\imgui\examples;.\..\..\..\imgui\backends;.\..\..\..\glew\include;.\..\..\..\glfw\include;.\..\..\..\glfw\src;.\..\..\..\vs-project\glfw\src;%(AdditionalIncludeDirectories) - $(IntDir) - - - OnlyExplicitInline - Custom - NotUsing - MultiThreaded - false - Level3 - %(PreprocessorDefinitions);WIN32;WIN_XP_86;_WINDOWS;NDEBUG;_GLFW_WIN32;UNICODE;_UNICODE;_CRT_SECURE_NO_WARNINGS;GLEW_STATIC;_WIN32_WINNT=0x0501;WINVER=0x0501;NTDDI_VERSION=0x05010100;VC_EXTRALEAN;_ATL_XP_TARGETING;WIN32_LEAN_AND_MEAN;PSAPI_VERSION=1 - $(IntDir) - - - stdcpplatest - true - Size - true - true - - - false - true - StreamingSIMDExtensions2 - true - true - /utf-8 %(AdditionalOptions) - false - stdclatest - - - %(PreprocessorDefinitions);WIN32;_WINDOWS;NDEBUG;_GLFW_WIN32;UNICODE;_UNICODE;_CRT_SECURE_NO_WARNINGS;GLEW_STATIC; - .\..\..\..\src;.\..\..\..\src\bsp;.\..\..\..\src\cli;.\..\..\..\src\data;.\..\..\..\src\editor;.\..\..\..\src\filedialog;.\..\..\..\src\gl;.\..\..\..\src\qtools;.\..\..\..\src\util;.\..\..\..\src\mdlviewer;.\..\..\..\imgui;.\..\..\..\imgui\examples;.\..\..\..\imgui\backends;.\..\..\..\glew\include;.\..\..\..\glfw\include;.\..\..\..\glfw\src;.\..\..\..\vs-project\glfw\src;%(AdditionalIncludeDirectories) - - - .\..\..\..\src;.\..\..\..\src\bsp;.\..\..\..\src\cli;.\..\..\..\src\data;.\..\..\..\src\editor;.\..\..\..\src\filedialog;.\..\..\..\src\gl;.\..\..\..\src\qtools;.\..\..\..\src\util;.\..\..\..\src\mdlviewer;.\..\..\..\imgui;.\..\..\..\imgui\examples;.\..\..\..\imgui\backends;.\..\..\..\glew\include;.\..\..\..\glfw\include;.\..\..\..\glfw\src;.\..\..\..\vs-project\glfw\src;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) - %(Filename).h - %(Filename).tlb - %(Filename)_i.c - %(Filename)_p.c - - - %(AdditionalOptions) /machine:x86 - MachineX86 - - .\..\..\..\src;.\..\..\..\src\bsp;.\..\..\..\src\cli;.\..\..\..\src\data;.\..\..\..\src\editor;.\..\..\..\src\filedialog;.\..\..\..\src\gl;.\..\..\..\src\qtools;.\..\..\..\src\util;.\..\..\..\src\mdlviewer;.\..\..\..\imgui;.\..\..\..\imgui\examples;.\..\..\..\imgui\backends;.\..\..\..\glew\include;.\..\..\..\glfw\include;.\..\..\..\glfw\src;.\..\..\..\vs-project\glfw\src;%(AdditionalIncludeDirectories)