From d6c9aa93af760da40f3754a86ba5b418d7d50650 Mon Sep 17 00:00:00 2001 From: RGreenlees Date: Thu, 7 Sep 2023 20:40:51 +0100 Subject: [PATCH] Removed additional unneeded dependencies And added SERVER preprocessor definition for debug/playtest --- main/source/cl_dll/cl_dll.vcxproj | 6 +++--- main/source/cl_dll/cl_dll.vcxproj.user | 11 +++++++---- main/source/dlls/hl.vcxproj | 16 ++++++++-------- main/source/dlls/hl.vcxproj.user | 7 ++++++- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/main/source/cl_dll/cl_dll.vcxproj b/main/source/cl_dll/cl_dll.vcxproj index 494c53bb..a20fee17 100644 --- a/main/source/cl_dll/cl_dll.vcxproj +++ b/main/source/cl_dll/cl_dll.vcxproj @@ -122,7 +122,7 @@ particles.lib;vgui.lib;wsock32.lib;sdl2.lib;opengl32.lib;%(AdditionalDependencies) true - $(SolutionDir)\Release\Particles;$(SolutionDir)\includes\lpng1251;$(SolutionDir)\includes\zlib-1.2.8;$(SolutionDir)\includes\vgui\lib\win32_vc6;$(SolutionDir)\lib\public;%(AdditionalLibraryDirectories) + $(SolutionDir)\Release\Particles;$(SolutionDir)\includes\vgui\lib\win32_vc6;$(SolutionDir)\lib\public @@ -185,7 +185,7 @@ particles.lib;vgui.lib;wsock32.lib;sdl2.lib;opengl32.lib;%(AdditionalDependencies) true - $(SolutionDir)\Release\Particles;$(SolutionDir)\includes\lpng1251;$(SolutionDir)\includes\zlib-1.2.8;$(SolutionDir)\includes\vgui\lib\win32_vc6;$(SolutionDir)\lib\public;%(AdditionalLibraryDirectories) + $(SolutionDir)\Release\Particles;$(SolutionDir)\includes\vgui\lib\win32_vc6;$(SolutionDir)\lib\public @@ -249,7 +249,7 @@ particles.lib;vgui.lib;wsock32.lib;sdl2.lib;opengl32.lib;%(AdditionalDependencies) true - $(SolutionDir)\Debug\Particles;$(SolutionDir)\includes\lpng1251;$(SolutionDir)\includes\zlib-1.2.8;$(SolutionDir)\includes\vgui\lib\win32_vc6;$(SolutionDir)\lib\public;%(AdditionalLibraryDirectories) + $(SolutionDir)\Debug\Particles;$(SolutionDir)\includes\vgui\lib\win32_vc6;$(SolutionDir)\lib\public $(OutDir)cl_dll.pdb diff --git a/main/source/cl_dll/cl_dll.vcxproj.user b/main/source/cl_dll/cl_dll.vcxproj.user index 73162aaa..8c0e73c0 100644 --- a/main/source/cl_dll/cl_dll.vcxproj.user +++ b/main/source/cl_dll/cl_dll.vcxproj.user @@ -1,9 +1,11 @@  - C:\Program Files (x86)\Steam\steamapps\common\Half-Life\hl.exe + + WindowsLocalDebugger - -allowdebug -dev -steam -game ns + + ..\.. false Auto @@ -19,9 +21,10 @@ Auto - E:\SteamLibrary\steamapps\common\Half-Life\hl.exe + + WindowsLocalDebugger - -allowdebug -dev -steam -game ns + -allowdebug -dev -game ns ..\.. false Auto diff --git a/main/source/dlls/hl.vcxproj b/main/source/dlls/hl.vcxproj index eb70e3e0..4dc31c8f 100644 --- a/main/source/dlls/hl.vcxproj +++ b/main/source/dlls/hl.vcxproj @@ -82,7 +82,7 @@ Disabled - _CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_DEBUG;DEBUG;WIN32;_WINDOWS;QUIVER;VOXEL;QUAKE2;VALVE_DLL;AVH_SERVER;USE_OLDAUTH;AVH_NO_NEXUS;AVH_PLAYTEST_BUILD;BALANCE_ENABLED;PLAYTEST_BUILD + _CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_DEBUG;DEBUG;WIN32;_WINDOWS;QUIVER;VOXEL;QUAKE2;VALVE_DLL;AVH_SERVER;SERVER;USE_OLDAUTH;AVH_NO_NEXUS;AVH_PLAYTEST_BUILD;BALANCE_ENABLED;PLAYTEST_BUILD MultiThreadedDebugDLL true @@ -100,10 +100,10 @@ $(SolutionDir);$(SolutionDir)\includes\lua\include;$(SolutionDir)\particles\;$(SolutionDir)\includes\vgui\include;$(SolutionDir)\includes\libcurl-7.50-nossl\include;$(SolutionDir)\common;$(SolutionDir)\public;$(SolutionDir)\util;$(SolutionDir)\engine;%(AdditionalIncludeDirectories) - particles.lib;lua5.1.lib;Winmm.lib;%(AdditionalDependencies) + winmm.lib;ws2_32.lib;particles.lib;%(AdditionalDependencies) $(SolutionDir)\Debug\Server\$(TargetName).dll true - $(SolutionDir)includes\libcurl-7.50-nossl;$(SolutionDir)includes\vgui\lib\win32_vc6;$(SolutionDir)includes\lua\lib;$(SolutionDir)\Debug\Particles;%(AdditionalLibraryDirectories) + $(SolutionDir)\Debug\Particles;$(SolutionDir)\includes\lpng1251;$(SolutionDir)\includes\zlib-1.2.8;$(SolutionDir)\includes\vgui\lib\win32_vc6;$(SolutionDir)\lib\public;%(AdditionalLibraryDirectories) libcmt;%(IgnoreSpecificDefaultLibraries) .\hl.def true @@ -137,7 +137,7 @@ Full OnlyExplicitInline false - _CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;WIN32;_WINDOWS;QUIVER;VOXEL;QUAKE2;VALVE_DLL;AVH_SERVER;AVH_NO_NEXUS;USE_OLDAUTH;AVH_PLAYTEST_BUILD;BALANCE_ENABLED;PLAYTEST_BUILD + _CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;WIN32;_WINDOWS;QUIVER;VOXEL;QUAKE2;VALVE_DLL;AVH_SERVER;SERVER;AVH_NO_NEXUS;USE_OLDAUTH;AVH_PLAYTEST_BUILD;BALANCE_ENABLED;PLAYTEST_BUILD true false MultiThreadedDLL @@ -157,7 +157,7 @@ $(SolutionDir);$(SolutionDir)\includes\lua\include;$(SolutionDir)\particles\;$(SolutionDir)\includes\vgui\include;$(SolutionDir)\includes\libcurl-7.50-nossl\include;$(SolutionDir)\common;$(SolutionDir)\public;$(SolutionDir)\util;$(SolutionDir)\engine;%(AdditionalIncludeDirectories) - winmm.lib;ws2_32.lib;particles.lib;lua5.1.lib;libcurl_a.lib;%(AdditionalDependencies);legacy_stdio_definitions.lib + winmm.lib;ws2_32.lib;particles.lib;%(AdditionalDependencies) true gdi32.lib user32.lib;%(IgnoreSpecificDefaultLibraries) .\hl.def @@ -169,7 +169,7 @@ false false /NODEFAULTLIB:LIBCMT %(AdditionalOptions) - $(SolutionDir)includes\lua\lib;$(SolutionDir)\Release\Particles;$(SolutionDir)includes\libcurl-7.50-nossl;$(SolutionDir)includes\vgui\lib\win32_vc6;%(AdditionalLibraryDirectories) + $(SolutionDir)\Release\Particles;$(SolutionDir)\includes\lpng1251;$(SolutionDir)\includes\zlib-1.2.8;$(SolutionDir)\includes\vgui\lib\win32_vc6;$(SolutionDir)\lib\public;%(AdditionalLibraryDirectories) false false $(SolutionDir)\Playtest\Server\$(TargetName).dll @@ -215,7 +215,7 @@ true - winmm.lib;ws2_32.lib;particles.lib;lua5.1.lib;libcurl_a.lib;%(AdditionalDependencies);legacy_stdio_definitions.lib + winmm.lib;ws2_32.lib;particles.lib;%(AdditionalDependencies) true gdi32.lib user32.lib;%(IgnoreSpecificDefaultLibraries) .\hl.def @@ -227,7 +227,7 @@ false false /NODEFAULTLIB:LIBCMT %(AdditionalOptions) - $(SolutionDir)includes\lua\lib;$(SolutionDir)\Release\Particles;$(SolutionDir)includes\libcurl-7.50-nossl;$(SolutionDir)includes\vgui\lib\win32_vc6;%(AdditionalLibraryDirectories) + $(SolutionDir)\Release\Particles;$(SolutionDir)\includes\lpng1251;$(SolutionDir)\includes\zlib-1.2.8;$(SolutionDir)\includes\vgui\lib\win32_vc6;$(SolutionDir)\lib\public;%(AdditionalLibraryDirectories) false false $(SolutionDir)\Release\Server\$(TargetName).dll diff --git a/main/source/dlls/hl.vcxproj.user b/main/source/dlls/hl.vcxproj.user index d9c6f061..7228bc15 100644 --- a/main/source/dlls/hl.vcxproj.user +++ b/main/source/dlls/hl.vcxproj.user @@ -4,7 +4,8 @@ WindowsLocalDebugger - -game ns + + @@ -12,4 +13,8 @@ + + -allowdebug -dev -game ns + WindowsLocalDebugger + \ No newline at end of file