diff --git a/sourcemods/ep2chaos/gameinfo.txt b/sourcemods/ep2chaos/gameinfo.txt index 7b36c418..240eb646 100644 --- a/sourcemods/ep2chaos/gameinfo.txt +++ b/sourcemods/ep2chaos/gameinfo.txt @@ -11,7 +11,7 @@ { game+mod |gameinfo_path|custom/* game+mod+mod_write+default_write_path |gameinfo_path|. - gamebin |gameinfo_path|bin + gamebin |gameinfo_path|../ep1chaos/bin game+mod |gameinfo_path|../ep1chaos game+mod |gameinfo_path|../hl2chaos game "|gameinfo_path|..\..\common\Half-Life 2\ep2" diff --git a/sp/src/game/client/client_base.vpc b/sp/src/game/client/client_base.vpc index e2cb99e0..5da0517a 100644 --- a/sp/src/game/client/client_base.vpc +++ b/sp/src/game/client/client_base.vpc @@ -5,14 +5,12 @@ //----------------------------------------------------------------------------- $Macro OUTBINNAME "client" -$Macro OUTBINDIR1 "$SRCDIR\..\..\sourcemods\$GAMENAME1\bin" -$Macro OUTBINDIR2 "$SRCDIR\..\..\sourcemods\$GAMENAME2\bin" +$Macro OUTBINDIR "$SRCDIR\..\..\sourcemods\$GAMENAME\bin" // It's important to include $GAMENAME in the generated_proto directory // to avoid race conditions when multiple games are in one solution. -$Macro GENERATED_PROTO_DIR "$SRCDIR\game\client\generated_proto_$GAMENAME1" +$Macro GENERATED_PROTO_DIR "$SRCDIR\game\client\generated_proto_$GAMENAME" -$MacroRequired "GAMENAME1" -$MacroRequired "GAMENAME2" +$MacroRequired "GAMENAME" $Include "$SRCDIR\vpc_scripts\source_dll_base.vpc" $include "$SRCDIR\vpc_scripts\protobuf_builder.vpc" @@ -23,8 +21,8 @@ $Configuration "Debug" { $General { - $OutputDirectory ".\Debug_$GAMENAME1" [$WIN32] - $IntermediateDirectory ".\Debug_$GAMENAME1" [$WIN32] + $OutputDirectory ".\Debug_$GAMENAME" [$WIN32] + $IntermediateDirectory ".\Debug_$GAMENAME" [$WIN32] } } @@ -32,8 +30,8 @@ $Configuration "Release" { $General { - $OutputDirectory ".\Release_$GAMENAME1" [$WIN32] - $IntermediateDirectory ".\Release_$GAMENAME1" [$WIN32] + $OutputDirectory ".\Release_$GAMENAME" [$WIN32] + $IntermediateDirectory ".\Release_$GAMENAME" [$WIN32] } } @@ -41,7 +39,7 @@ $Configuration { $General { - $OutputDirectory ".\$GAMENAME1" [$OSXALL] + $OutputDirectory ".\$GAMENAME" [$OSXALL] } $Compiler diff --git a/sp/src/game/client/client_episodic.vcxproj b/sp/src/game/client/client_episodic.vcxproj index 583f16e5..9b406983 100644 --- a/sp/src/game/client/client_episodic.vcxproj +++ b/sp/src/game/client/client_episodic.vcxproj @@ -62,7 +62,7 @@ - if EXIST ..\..\..\..\sourcemods\ep2chaos\bin\.\$(TargetFileName) for /f "delims=" %%A in ('attrib "..\..\..\..\sourcemods\ep2chaos\bin\.\$(TargetFileName)"') do set valveTmpIsReadOnly="%%A" set valveTmpIsReadOnlyLetter=%valveTmpIsReadOnly:~6,1% if "%valveTmpIsReadOnlyLetter%"=="R" del /q "$(TargetDir)"$(TargetFileName) if exist "..\..\devtools\bin\vpc.exe" "..\..\devtools\bin\vpc.exe" -crc2 "client_episodic.vcxproj" if ERRORLEVEL 1 exit /b 1 + if EXIST ..\..\..\..\sourcemods\ep1chaos\bin\.\$(TargetFileName) for /f "delims=" %%A in ('attrib "..\..\..\..\sourcemods\ep1chaos\bin\.\$(TargetFileName)"') do set valveTmpIsReadOnly="%%A" set valveTmpIsReadOnlyLetter=%valveTmpIsReadOnly:~6,1% if "%valveTmpIsReadOnlyLetter%"=="R" del /q "$(TargetDir)"$(TargetFileName) if exist "..\..\devtools\bin\vpc.exe" "..\..\devtools\bin\vpc.exe" -crc2 "client_episodic.vcxproj" if ERRORLEVEL 1 exit /b 1 /Zm200 /Gw @@ -130,15 +130,15 @@ $(OutDir)/client.bsc - Publishing to ..\..\..\..\sourcemods\ep1chaos\bin\. and ..\..\..\..\sourcemods\ep2chaos\bin\. - if not exist "..\..\..\..\sourcemods\ep1chaos\bin\." mkdir "..\..\..\..\sourcemods\ep1chaos\bin\." copy "$(TargetDir)$(TargetFileName)" "..\..\..\..\sourcemods\ep1chaos\bin\.\$(TargetFileName)" if not exist "..\..\..\..\sourcemods\ep2chaos\bin\." mkdir "..\..\..\..\sourcemods\ep2chaos\bin\." copy "$(TargetDir)$(TargetFileName)" "..\..\..\..\sourcemods\ep2chaos\bin\.\$(TargetFileName)" if ERRORLEVEL 1 goto BuildEventFailed if exist "$(TargetDir)$(TargetName).map" copy "$(TargetDir)$(TargetName).map" ..\..\..\..\sourcemods\ep1chaos\bin\.\$(TargetName).map copy "$(TargetDir)$(TargetName).pdb" ..\..\..\..\sourcemods\ep1chaos\bin\.\$(TargetName).pdb if exist "$(TargetDir)$(TargetName).map" copy "$(TargetDir)$(TargetName).map" ..\..\..\..\sourcemods\ep2chaos\bin\.\$(TargetName).map copy "$(TargetDir)$(TargetName).pdb" ..\..\..\..\sourcemods\ep2chaos\bin\.\$(TargetName).pdb if ERRORLEVEL 1 goto BuildEventFailed goto BuildEventOK :BuildEventFailed echo *** ERROR! PostBuildStep FAILED for $(ProjectName)! EXE or DLL is probably running. *** del /q "$(TargetDir)$(TargetFileName)" exit 1 :BuildEventOK + Publishing to ..\..\..\..\sourcemods\ep1chaos\bin\. + if not exist "..\..\..\..\sourcemods\ep1chaos\bin\." mkdir "..\..\..\..\sourcemods\ep1chaos\bin\." copy "$(TargetDir)$(TargetFileName)" "..\..\..\..\sourcemods\ep1chaos\bin\.\$(TargetFileName)" if ERRORLEVEL 1 goto BuildEventFailed if exist "$(TargetDir)$(TargetName).map" copy "$(TargetDir)$(TargetName).map" ..\..\..\..\sourcemods\ep1chaos\bin\.\$(TargetName).map copy "$(TargetDir)$(TargetName).pdb" ..\..\..\..\sourcemods\ep1chaos\bin\.\$(TargetName).pdb if ERRORLEVEL 1 goto BuildEventFailed goto BuildEventOK :BuildEventFailed echo *** ERROR! PostBuildStep FAILED for $(ProjectName)! EXE or DLL is probably running. *** del /q "$(TargetDir)$(TargetFileName)" exit 1 :BuildEventOK - if EXIST ..\..\..\..\sourcemods\ep2chaos\bin\.\$(TargetFileName) for /f "delims=" %%A in ('attrib "..\..\..\..\sourcemods\ep2chaos\bin\.\$(TargetFileName)"') do set valveTmpIsReadOnly="%%A" set valveTmpIsReadOnlyLetter=%valveTmpIsReadOnly:~6,1% if "%valveTmpIsReadOnlyLetter%"=="R" del /q "$(TargetDir)"$(TargetFileName) if exist "..\..\devtools\bin\vpc.exe" "..\..\devtools\bin\vpc.exe" -crc2 "client_episodic.vcxproj" if ERRORLEVEL 1 exit /b 1 + if EXIST ..\..\..\..\sourcemods\ep1chaos\bin\.\$(TargetFileName) for /f "delims=" %%A in ('attrib "..\..\..\..\sourcemods\ep1chaos\bin\.\$(TargetFileName)"') do set valveTmpIsReadOnly="%%A" set valveTmpIsReadOnlyLetter=%valveTmpIsReadOnly:~6,1% if "%valveTmpIsReadOnlyLetter%"=="R" del /q "$(TargetDir)"$(TargetFileName) if exist "..\..\devtools\bin\vpc.exe" "..\..\devtools\bin\vpc.exe" -crc2 "client_episodic.vcxproj" if ERRORLEVEL 1 exit /b 1 /Zm200 /d2Zi+ /Gw @@ -211,8 +211,8 @@ $(OutDir)/client.bsc - Publishing to ..\..\..\..\sourcemods\ep1chaos\bin\. and ..\..\..\..\sourcemods\ep2chaos\bin\. - if not exist "..\..\..\..\sourcemods\ep1chaos\bin\." mkdir "..\..\..\..\sourcemods\ep1chaos\bin\." copy "$(TargetDir)$(TargetFileName)" "..\..\..\..\sourcemods\ep1chaos\bin\.\$(TargetFileName)" if not exist "..\..\..\..\sourcemods\ep2chaos\bin\." mkdir "..\..\..\..\sourcemods\ep2chaos\bin\." copy "$(TargetDir)$(TargetFileName)" "..\..\..\..\sourcemods\ep2chaos\bin\.\$(TargetFileName)" if ERRORLEVEL 1 goto BuildEventFailed if exist "$(TargetDir)$(TargetName).map" copy "$(TargetDir)$(TargetName).map" ..\..\..\..\sourcemods\ep1chaos\bin\.\$(TargetName).map copy "$(TargetDir)$(TargetName).pdb" ..\..\..\..\sourcemods\ep1chaos\bin\.\$(TargetName).pdb if exist "$(TargetDir)$(TargetName).map" copy "$(TargetDir)$(TargetName).map" ..\..\..\..\sourcemods\ep2chaos\bin\.\$(TargetName).map copy "$(TargetDir)$(TargetName).pdb" ..\..\..\..\sourcemods\ep2chaos\bin\.\$(TargetName).pdb if ERRORLEVEL 1 goto BuildEventFailed goto BuildEventOK :BuildEventFailed echo *** ERROR! PostBuildStep FAILED for $(ProjectName)! EXE or DLL is probably running. *** del /q "$(TargetDir)$(TargetFileName)" exit 1 :BuildEventOK + Publishing to ..\..\..\..\sourcemods\ep1chaos\bin\. + if not exist "..\..\..\..\sourcemods\ep1chaos\bin\." mkdir "..\..\..\..\sourcemods\ep1chaos\bin\." copy "$(TargetDir)$(TargetFileName)" "..\..\..\..\sourcemods\ep1chaos\bin\.\$(TargetFileName)" if ERRORLEVEL 1 goto BuildEventFailed if exist "$(TargetDir)$(TargetName).map" copy "$(TargetDir)$(TargetName).map" ..\..\..\..\sourcemods\ep1chaos\bin\.\$(TargetName).map copy "$(TargetDir)$(TargetName).pdb" ..\..\..\..\sourcemods\ep1chaos\bin\.\$(TargetName).pdb if ERRORLEVEL 1 goto BuildEventFailed goto BuildEventOK :BuildEventFailed echo *** ERROR! PostBuildStep FAILED for $(ProjectName)! EXE or DLL is probably running. *** del /q "$(TargetDir)$(TargetFileName)" exit 1 :BuildEventOK diff --git a/sp/src/game/client/client_episodic.vcxproj.vpc_crc b/sp/src/game/client/client_episodic.vcxproj.vpc_crc index 0474489c..9371bc9e 100644 --- a/sp/src/game/client/client_episodic.vcxproj.vpc_crc +++ b/sp/src/game/client/client_episodic.vcxproj.vpc_crc @@ -1,16 +1,16 @@ [vpc crc file version 2] 8209bbc3 C:\sourceproject\halflife2chaos\sp\src\devtools\bin\vpc.exe _Nc_VS2013/vpcgame:valve_ -fd63816e client_episodic.vpc -1b055d9e ..\..\game\client\client_base.vpc +68b20abc client_episodic.vpc +5e304034 ..\..\game\client\client_base.vpc 4832e67a ..\..\vpc_scripts\source_dll_base.vpc d752cf80 ..\..\vpc_scripts\platform_dirs.vpc 6c4a5ff1 ..\..\vpc_scripts\source_base.vpc -9587f360 ..\..\vpc_scripts\source_dll_win32_base.vpc +307760a1 ..\..\vpc_scripts\source_dll_win32_base.vpc 486b766d ..\..\vpc_scripts\version.vpc 846102f0 ..\..\vpc_scripts\loadaddress.vpc -9b8aa3b7 ..\..\vpc_scripts\source_dll_win32_debug.vpc -50782562 ..\..\vpc_scripts\source_dll_win32_release.vpc +0df0da71 ..\..\vpc_scripts\source_dll_win32_debug.vpc +7cf17fbc ..\..\vpc_scripts\source_dll_win32_release.vpc 34c37fcf ..\..\vpc_scripts\source_win32_base.vpc 346bda4a ..\..\vpc_scripts\source_video_base.vpc c209a88e ..\..\vpc_scripts\protobuf_builder.vpc diff --git a/sp/src/game/client/client_episodic.vpc b/sp/src/game/client/client_episodic.vpc index 1835e147..8f188a97 100644 --- a/sp/src/game/client/client_episodic.vpc +++ b/sp/src/game/client/client_episodic.vpc @@ -5,8 +5,7 @@ //----------------------------------------------------------------------------- $Macro SRCDIR "..\.." -$Macro GAMENAME1 "ep1chaos" -$Macro GAMENAME2 "ep2chaos" +$Macro GAMENAME "ep1chaos" $Include "$SRCDIR\game\client\client_base.vpc" diff --git a/sp/src/game/client/client_hl2.vcxproj b/sp/src/game/client/client_hl2.vcxproj index 1d4fb6e9..8a3bfb83 100644 --- a/sp/src/game/client/client_hl2.vcxproj +++ b/sp/src/game/client/client_hl2.vcxproj @@ -130,8 +130,8 @@ $(OutDir)/client.bsc - Publishing to ..\..\..\..\sourcemods\hl2chaos\bin\. and ..\..\..\..\sourcemods\hl2chaos\bin\. - if not exist "..\..\..\..\sourcemods\hl2chaos\bin\." mkdir "..\..\..\..\sourcemods\hl2chaos\bin\." copy "$(TargetDir)$(TargetFileName)" "..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetFileName)" if not exist "..\..\..\..\sourcemods\hl2chaos\bin\." mkdir "..\..\..\..\sourcemods\hl2chaos\bin\." copy "$(TargetDir)$(TargetFileName)" "..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetFileName)" if ERRORLEVEL 1 goto BuildEventFailed if exist "$(TargetDir)$(TargetName).map" copy "$(TargetDir)$(TargetName).map" ..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetName).map copy "$(TargetDir)$(TargetName).pdb" ..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetName).pdb if exist "$(TargetDir)$(TargetName).map" copy "$(TargetDir)$(TargetName).map" ..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetName).map copy "$(TargetDir)$(TargetName).pdb" ..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetName).pdb if ERRORLEVEL 1 goto BuildEventFailed goto BuildEventOK :BuildEventFailed echo *** ERROR! PostBuildStep FAILED for $(ProjectName)! EXE or DLL is probably running. *** del /q "$(TargetDir)$(TargetFileName)" exit 1 :BuildEventOK + Publishing to ..\..\..\..\sourcemods\hl2chaos\bin\. + if not exist "..\..\..\..\sourcemods\hl2chaos\bin\." mkdir "..\..\..\..\sourcemods\hl2chaos\bin\." copy "$(TargetDir)$(TargetFileName)" "..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetFileName)" if ERRORLEVEL 1 goto BuildEventFailed if exist "$(TargetDir)$(TargetName).map" copy "$(TargetDir)$(TargetName).map" ..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetName).map copy "$(TargetDir)$(TargetName).pdb" ..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetName).pdb if ERRORLEVEL 1 goto BuildEventFailed goto BuildEventOK :BuildEventFailed echo *** ERROR! PostBuildStep FAILED for $(ProjectName)! EXE or DLL is probably running. *** del /q "$(TargetDir)$(TargetFileName)" exit 1 :BuildEventOK @@ -211,8 +211,8 @@ $(OutDir)/client.bsc - Publishing to ..\..\..\..\sourcemods\hl2chaos\bin\. and ..\..\..\..\sourcemods\hl2chaos\bin\. - if not exist "..\..\..\..\sourcemods\hl2chaos\bin\." mkdir "..\..\..\..\sourcemods\hl2chaos\bin\." copy "$(TargetDir)$(TargetFileName)" "..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetFileName)" if not exist "..\..\..\..\sourcemods\hl2chaos\bin\." mkdir "..\..\..\..\sourcemods\hl2chaos\bin\." copy "$(TargetDir)$(TargetFileName)" "..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetFileName)" if ERRORLEVEL 1 goto BuildEventFailed if exist "$(TargetDir)$(TargetName).map" copy "$(TargetDir)$(TargetName).map" ..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetName).map copy "$(TargetDir)$(TargetName).pdb" ..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetName).pdb if exist "$(TargetDir)$(TargetName).map" copy "$(TargetDir)$(TargetName).map" ..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetName).map copy "$(TargetDir)$(TargetName).pdb" ..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetName).pdb if ERRORLEVEL 1 goto BuildEventFailed goto BuildEventOK :BuildEventFailed echo *** ERROR! PostBuildStep FAILED for $(ProjectName)! EXE or DLL is probably running. *** del /q "$(TargetDir)$(TargetFileName)" exit 1 :BuildEventOK + Publishing to ..\..\..\..\sourcemods\hl2chaos\bin\. + if not exist "..\..\..\..\sourcemods\hl2chaos\bin\." mkdir "..\..\..\..\sourcemods\hl2chaos\bin\." copy "$(TargetDir)$(TargetFileName)" "..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetFileName)" if ERRORLEVEL 1 goto BuildEventFailed if exist "$(TargetDir)$(TargetName).map" copy "$(TargetDir)$(TargetName).map" ..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetName).map copy "$(TargetDir)$(TargetName).pdb" ..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetName).pdb if ERRORLEVEL 1 goto BuildEventFailed goto BuildEventOK :BuildEventFailed echo *** ERROR! PostBuildStep FAILED for $(ProjectName)! EXE or DLL is probably running. *** del /q "$(TargetDir)$(TargetFileName)" exit 1 :BuildEventOK diff --git a/sp/src/game/client/client_hl2.vcxproj.vpc_crc b/sp/src/game/client/client_hl2.vcxproj.vpc_crc index f0dbdf2f..74993745 100644 --- a/sp/src/game/client/client_hl2.vcxproj.vpc_crc +++ b/sp/src/game/client/client_hl2.vcxproj.vpc_crc @@ -1,16 +1,16 @@ [vpc crc file version 2] 8209bbc3 C:\sourceproject\halflife2chaos\sp\src\devtools\bin\vpc.exe _Nc_VS2013/vpcgame:valve_ -4888f882 client_hl2.vpc -1b055d9e ..\..\game\client\client_base.vpc +c8845680 client_hl2.vpc +5e304034 ..\..\game\client\client_base.vpc 4832e67a ..\..\vpc_scripts\source_dll_base.vpc d752cf80 ..\..\vpc_scripts\platform_dirs.vpc 6c4a5ff1 ..\..\vpc_scripts\source_base.vpc -9587f360 ..\..\vpc_scripts\source_dll_win32_base.vpc +307760a1 ..\..\vpc_scripts\source_dll_win32_base.vpc 486b766d ..\..\vpc_scripts\version.vpc 846102f0 ..\..\vpc_scripts\loadaddress.vpc -9b8aa3b7 ..\..\vpc_scripts\source_dll_win32_debug.vpc -50782562 ..\..\vpc_scripts\source_dll_win32_release.vpc +0df0da71 ..\..\vpc_scripts\source_dll_win32_debug.vpc +7cf17fbc ..\..\vpc_scripts\source_dll_win32_release.vpc 34c37fcf ..\..\vpc_scripts\source_win32_base.vpc 346bda4a ..\..\vpc_scripts\source_video_base.vpc c209a88e ..\..\vpc_scripts\protobuf_builder.vpc diff --git a/sp/src/game/client/client_hl2.vpc b/sp/src/game/client/client_hl2.vpc index 4490ce6f..bc69fb1a 100644 --- a/sp/src/game/client/client_hl2.vpc +++ b/sp/src/game/client/client_hl2.vpc @@ -5,8 +5,7 @@ //----------------------------------------------------------------------------- $Macro SRCDIR "..\.." -$Macro GAMENAME1 "hl2chaos" -$Macro GAMENAME2 "hl2chaos" +$Macro GAMENAME "hl2chaos" $Include "$SRCDIR\game\client\client_base.vpc" $Include "$SRCDIR\game\protobuf_include.vpc" diff --git a/sp/src/game/server/server_base.vpc b/sp/src/game/server/server_base.vpc index d9b49373..487b19aa 100644 --- a/sp/src/game/server/server_base.vpc +++ b/sp/src/game/server/server_base.vpc @@ -5,14 +5,12 @@ //----------------------------------------------------------------------------- $Macro OUTBINNAME "server" -$Macro OUTBINDIR1 "$SRCDIR\..\..\sourcemods\$GAMENAME1\bin" -$Macro OUTBINDIR2 "$SRCDIR\..\..\sourcemods\$GAMENAME2\bin" +$Macro OUTBINDIR "$SRCDIR\..\..\sourcemods\$GAMENAME\bin" // It's important to include $GAMENAME in the generated_proto directory // to avoid race conditions when multiple games are in one solution. -$Macro GENERATED_PROTO_DIR "$SRCDIR\game\server\generated_proto_$GAMENAME1" +$Macro GENERATED_PROTO_DIR "$SRCDIR\game\server\generated_proto_$GAMENAME" -$MacroRequired "GAMENAME1" -$MacroRequired "GAMENAME2" +$MacroRequired "GAMENAME" $include "$SRCDIR\vpc_scripts\source_dll_base.vpc" $include "$SRCDIR\vpc_scripts\protobuf_builder.vpc" @@ -23,8 +21,7 @@ $Configuration "Debug" { $General { - $OutputDirectory ".\Debug_$GAMENAME1" [$WIN32] - $IntermediateDirectory ".\Debug_$GAMENAME1" [$WIN32] + $OutputDirectory ".\Debug_$GAMENAME" [$WIN32] } } @@ -32,8 +29,7 @@ $Configuration "Release" { $General { - $OutputDirectory ".\Release_$GAMENAME1" [$WIN32] - $IntermediateDirectory ".\Release_$GAMENAME1" [$WIN32] + $OutputDirectory ".\Release_$GAMENAME" [$WIN32] } } @@ -41,7 +37,7 @@ $Configuration { $General { - $OutputDirectory ".\$GAMENAME1" [$OSXALL] + $OutputDirectory ".\$GAMENAME" [$OSXALL] } $Compiler diff --git a/sp/src/game/server/server_episodic.vcxproj b/sp/src/game/server/server_episodic.vcxproj index 44854b8f..c642b27b 100644 --- a/sp/src/game/server/server_episodic.vcxproj +++ b/sp/src/game/server/server_episodic.vcxproj @@ -40,7 +40,7 @@ <_ProjectFileVersion>10.0.30319.1 .\Debug_ep1chaos\ - .\Debug_ep1chaos\ + .\Debugep1chaos\.\ .dll ..\..\devtools\vstools;$(ExecutablePath);$(Path) true @@ -49,7 +49,7 @@ false true .\Release_ep1chaos\ - .\Release_ep1chaos\ + .\Releaseep1chaos\.\ .dll ..\..\devtools\vstools;$(ExecutablePath);$(Path) true @@ -60,13 +60,13 @@ - if EXIST ..\..\..\..\sourcemods\ep2chaos\bin\.\$(TargetFileName) for /f "delims=" %%A in ('attrib "..\..\..\..\sourcemods\ep2chaos\bin\.\$(TargetFileName)"') do set valveTmpIsReadOnly="%%A" set valveTmpIsReadOnlyLetter=%valveTmpIsReadOnly:~6,1% if "%valveTmpIsReadOnlyLetter%"=="R" del /q "$(TargetDir)"$(TargetFileName) if exist "..\..\devtools\bin\vpc.exe" "..\..\devtools\bin\vpc.exe" -crc2 "server_episodic.vcxproj" if ERRORLEVEL 1 exit /b 1 + if EXIST ..\..\..\..\sourcemods\ep1chaos\bin\.\$(TargetFileName) for /f "delims=" %%A in ('attrib "..\..\..\..\sourcemods\ep1chaos\bin\.\$(TargetFileName)"') do set valveTmpIsReadOnly="%%A" set valveTmpIsReadOnlyLetter=%valveTmpIsReadOnly:~6,1% if "%valveTmpIsReadOnlyLetter%"=="R" del /q "$(TargetDir)"$(TargetFileName) if exist "..\..\devtools\bin\vpc.exe" "..\..\devtools\bin\vpc.exe" -crc2 "server_episodic.vcxproj" if ERRORLEVEL 1 exit /b 1 /Zm200 /Gw Disabled ..\..\common;..\..\public;..\..\public\tier0;..\..\public\tier1;..\..\game\server\generated_proto_ep1chaos;..\..\thirdparty\protobuf-2.3.0\src;.\;..\..\game\shared;..\..\utils\common;..\..\game\shared\econ;..\..\game\server\NextBot;..\..\game\shared\hl2;..\..\game\shared\episodic;.\hl2;.\episodic - VPC;RAD_TELEMETRY_DISABLED;_HAS_ITERATOR_DEBUGGING=0;WIN32;_WIN32;_DEBUG;DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;%(PreprocessorDefinitions);COMPILER_MSVC32;COMPILER_MSVC32;COMPILER_MSVC;_DLL_EXT=.dll;DLLNAME=server;BINK_VIDEO;AVI_VIDEO;WMV_VIDEO;DEV_BUILD;FRAME_POINTER_OMISSION_DISABLED;GAME_DLL;VECTOR;VERSION_SAFE_STEAM_API_INTERFACES;PROTECTED_THINGS_ENABLE;sprintf=use_Q_snprintf_instead_of_sprintf;strncpy=use_Q_strncpy_instead;_snprintf=use_Q_snprintf_instead;fopen=dont_use_fopen;HL2_DLL;HL2_EPISODIC;USES_SAVERESTORE;_EXTERNAL_DLL_EXT=.dll;VPCGAMECAPS=VALVE;PROJECTDIR=C:\sourceproject\halflife2chaos\sp\src\game\server;_DLL_EXT=.dll;SOURCE1=1;VPCGAME=valve + VPC;RAD_TELEMETRY_DISABLED;_HAS_ITERATOR_DEBUGGING=0;WIN32;_WIN32;_DEBUG;DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;%(PreprocessorDefinitions);COMPILER_MSVC32;COMPILER_MSVC32;COMPILER_MSVC;_DLL_EXT=.dll;DLLNAME=server;BINK_VIDEO;AVI_VIDEO;WMV_VIDEO;DEV_BUILD;FRAME_POINTER_OMISSION_DISABLED;GAME_DLL;VECTOR;VERSION_SAFE_STEAM_API_INTERFACES;PROTECTED_THINGS_ENABLE;sprintf=use_Q_snprintf_instead_of_sprintf;strncpy=use_Q_strncpy_instead;_snprintf=use_Q_snprintf_instead;fopen=dont_use_fopen;HL2_DLL;HL2_EPISODIC;USES_SAVERESTORE;_EXTERNAL_DLL_EXT=.dll;VPCGAMECAPS=VALVE;PROJECTDIR=C:\sourceproject\halflife2chaos\sp\src\game\server;_DLL_EXT=.dll;VPCGAME=valve;SOURCE1=1 true false Default @@ -127,15 +127,15 @@ $(OutDir)/server.bsc - Publishing to ..\..\..\..\sourcemods\ep1chaos\bin\. and ..\..\..\..\sourcemods\ep2chaos\bin\. - if not exist "..\..\..\..\sourcemods\ep1chaos\bin\." mkdir "..\..\..\..\sourcemods\ep1chaos\bin\." copy "$(TargetDir)$(TargetFileName)" "..\..\..\..\sourcemods\ep1chaos\bin\.\$(TargetFileName)" if not exist "..\..\..\..\sourcemods\ep2chaos\bin\." mkdir "..\..\..\..\sourcemods\ep2chaos\bin\." copy "$(TargetDir)$(TargetFileName)" "..\..\..\..\sourcemods\ep2chaos\bin\.\$(TargetFileName)" if ERRORLEVEL 1 goto BuildEventFailed if exist "$(TargetDir)$(TargetName).map" copy "$(TargetDir)$(TargetName).map" ..\..\..\..\sourcemods\ep1chaos\bin\.\$(TargetName).map copy "$(TargetDir)$(TargetName).pdb" ..\..\..\..\sourcemods\ep1chaos\bin\.\$(TargetName).pdb if exist "$(TargetDir)$(TargetName).map" copy "$(TargetDir)$(TargetName).map" ..\..\..\..\sourcemods\ep2chaos\bin\.\$(TargetName).map copy "$(TargetDir)$(TargetName).pdb" ..\..\..\..\sourcemods\ep2chaos\bin\.\$(TargetName).pdb if ERRORLEVEL 1 goto BuildEventFailed goto BuildEventOK :BuildEventFailed echo *** ERROR! PostBuildStep FAILED for $(ProjectName)! EXE or DLL is probably running. *** del /q "$(TargetDir)$(TargetFileName)" exit 1 :BuildEventOK + Publishing to ..\..\..\..\sourcemods\ep1chaos\bin\. + if not exist "..\..\..\..\sourcemods\ep1chaos\bin\." mkdir "..\..\..\..\sourcemods\ep1chaos\bin\." copy "$(TargetDir)$(TargetFileName)" "..\..\..\..\sourcemods\ep1chaos\bin\.\$(TargetFileName)" if ERRORLEVEL 1 goto BuildEventFailed if exist "$(TargetDir)$(TargetName).map" copy "$(TargetDir)$(TargetName).map" ..\..\..\..\sourcemods\ep1chaos\bin\.\$(TargetName).map copy "$(TargetDir)$(TargetName).pdb" ..\..\..\..\sourcemods\ep1chaos\bin\.\$(TargetName).pdb if ERRORLEVEL 1 goto BuildEventFailed goto BuildEventOK :BuildEventFailed echo *** ERROR! PostBuildStep FAILED for $(ProjectName)! EXE or DLL is probably running. *** del /q "$(TargetDir)$(TargetFileName)" exit 1 :BuildEventOK - if EXIST ..\..\..\..\sourcemods\ep2chaos\bin\.\$(TargetFileName) for /f "delims=" %%A in ('attrib "..\..\..\..\sourcemods\ep2chaos\bin\.\$(TargetFileName)"') do set valveTmpIsReadOnly="%%A" set valveTmpIsReadOnlyLetter=%valveTmpIsReadOnly:~6,1% if "%valveTmpIsReadOnlyLetter%"=="R" del /q "$(TargetDir)"$(TargetFileName) if exist "..\..\devtools\bin\vpc.exe" "..\..\devtools\bin\vpc.exe" -crc2 "server_episodic.vcxproj" if ERRORLEVEL 1 exit /b 1 + if EXIST ..\..\..\..\sourcemods\ep1chaos\bin\.\$(TargetFileName) for /f "delims=" %%A in ('attrib "..\..\..\..\sourcemods\ep1chaos\bin\.\$(TargetFileName)"') do set valveTmpIsReadOnly="%%A" set valveTmpIsReadOnlyLetter=%valveTmpIsReadOnly:~6,1% if "%valveTmpIsReadOnlyLetter%"=="R" del /q "$(TargetDir)"$(TargetFileName) if exist "..\..\devtools\bin\vpc.exe" "..\..\devtools\bin\vpc.exe" -crc2 "server_episodic.vcxproj" if ERRORLEVEL 1 exit /b 1 /Zm200 /d2Zi+ /Gw @@ -144,7 +144,7 @@ true Speed ..\..\common;..\..\public;..\..\public\tier0;..\..\public\tier1;..\..\game\server\generated_proto_ep1chaos;..\..\thirdparty\protobuf-2.3.0\src;.\;..\..\game\shared;..\..\utils\common;..\..\game\shared\econ;..\..\game\server\NextBot;..\..\game\shared\hl2;..\..\game\shared\episodic;.\hl2;.\episodic - VPC;RAD_TELEMETRY_DISABLED;WIN32;_WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;%(PreprocessorDefinitions);COMPILER_MSVC32;COMPILER_MSVC32;COMPILER_MSVC;_DLL_EXT=.dll;DLLNAME=server;BINK_VIDEO;AVI_VIDEO;WMV_VIDEO;DEV_BUILD;FRAME_POINTER_OMISSION_DISABLED;GAME_DLL;VECTOR;VERSION_SAFE_STEAM_API_INTERFACES;PROTECTED_THINGS_ENABLE;sprintf=use_Q_snprintf_instead_of_sprintf;strncpy=use_Q_strncpy_instead;_snprintf=use_Q_snprintf_instead;fopen=dont_use_fopen;HL2_DLL;HL2_EPISODIC;USES_SAVERESTORE;_EXTERNAL_DLL_EXT=.dll;VPCGAMECAPS=VALVE;PROJECTDIR=C:\sourceproject\halflife2chaos\sp\src\game\server;_DLL_EXT=.dll;SOURCE1=1;VPCGAME=valve + VPC;RAD_TELEMETRY_DISABLED;WIN32;_WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;%(PreprocessorDefinitions);COMPILER_MSVC32;COMPILER_MSVC32;COMPILER_MSVC;_DLL_EXT=.dll;DLLNAME=server;BINK_VIDEO;AVI_VIDEO;WMV_VIDEO;DEV_BUILD;FRAME_POINTER_OMISSION_DISABLED;GAME_DLL;VECTOR;VERSION_SAFE_STEAM_API_INTERFACES;PROTECTED_THINGS_ENABLE;sprintf=use_Q_snprintf_instead_of_sprintf;strncpy=use_Q_strncpy_instead;_snprintf=use_Q_snprintf_instead;fopen=dont_use_fopen;HL2_DLL;HL2_EPISODIC;USES_SAVERESTORE;_EXTERNAL_DLL_EXT=.dll;VPCGAMECAPS=VALVE;PROJECTDIR=C:\sourceproject\halflife2chaos\sp\src\game\server;_DLL_EXT=.dll;VPCGAME=valve;SOURCE1=1 true false MultiThreaded @@ -207,8 +207,8 @@ $(OutDir)/server.bsc - Publishing to ..\..\..\..\sourcemods\ep1chaos\bin\. and ..\..\..\..\sourcemods\ep2chaos\bin\. - if not exist "..\..\..\..\sourcemods\ep1chaos\bin\." mkdir "..\..\..\..\sourcemods\ep1chaos\bin\." copy "$(TargetDir)$(TargetFileName)" "..\..\..\..\sourcemods\ep1chaos\bin\.\$(TargetFileName)" if not exist "..\..\..\..\sourcemods\ep2chaos\bin\." mkdir "..\..\..\..\sourcemods\ep2chaos\bin\." copy "$(TargetDir)$(TargetFileName)" "..\..\..\..\sourcemods\ep2chaos\bin\.\$(TargetFileName)" if ERRORLEVEL 1 goto BuildEventFailed if exist "$(TargetDir)$(TargetName).map" copy "$(TargetDir)$(TargetName).map" ..\..\..\..\sourcemods\ep1chaos\bin\.\$(TargetName).map copy "$(TargetDir)$(TargetName).pdb" ..\..\..\..\sourcemods\ep1chaos\bin\.\$(TargetName).pdb if exist "$(TargetDir)$(TargetName).map" copy "$(TargetDir)$(TargetName).map" ..\..\..\..\sourcemods\ep2chaos\bin\.\$(TargetName).map copy "$(TargetDir)$(TargetName).pdb" ..\..\..\..\sourcemods\ep2chaos\bin\.\$(TargetName).pdb if ERRORLEVEL 1 goto BuildEventFailed goto BuildEventOK :BuildEventFailed echo *** ERROR! PostBuildStep FAILED for $(ProjectName)! EXE or DLL is probably running. *** del /q "$(TargetDir)$(TargetFileName)" exit 1 :BuildEventOK + Publishing to ..\..\..\..\sourcemods\ep1chaos\bin\. + if not exist "..\..\..\..\sourcemods\ep1chaos\bin\." mkdir "..\..\..\..\sourcemods\ep1chaos\bin\." copy "$(TargetDir)$(TargetFileName)" "..\..\..\..\sourcemods\ep1chaos\bin\.\$(TargetFileName)" if ERRORLEVEL 1 goto BuildEventFailed if exist "$(TargetDir)$(TargetName).map" copy "$(TargetDir)$(TargetName).map" ..\..\..\..\sourcemods\ep1chaos\bin\.\$(TargetName).map copy "$(TargetDir)$(TargetName).pdb" ..\..\..\..\sourcemods\ep1chaos\bin\.\$(TargetName).pdb if ERRORLEVEL 1 goto BuildEventFailed goto BuildEventOK :BuildEventFailed echo *** ERROR! PostBuildStep FAILED for $(ProjectName)! EXE or DLL is probably running. *** del /q "$(TargetDir)$(TargetFileName)" exit 1 :BuildEventOK diff --git a/sp/src/game/server/server_episodic.vcxproj.vpc_crc b/sp/src/game/server/server_episodic.vcxproj.vpc_crc index db0dddd8..15adf428 100644 --- a/sp/src/game/server/server_episodic.vcxproj.vpc_crc +++ b/sp/src/game/server/server_episodic.vcxproj.vpc_crc @@ -1,16 +1,16 @@ [vpc crc file version 2] 8209bbc3 C:\sourceproject\halflife2chaos\sp\src\devtools\bin\vpc.exe _Nc_VS2013/vpcgame:valve_ -8f4f00f4 server_episodic.vpc -e9d9ca9a ..\..\game\server\server_base.vpc +dd693ec4 server_episodic.vpc +faeae84f ..\..\game\server\server_base.vpc 4832e67a ..\..\vpc_scripts\source_dll_base.vpc d752cf80 ..\..\vpc_scripts\platform_dirs.vpc 6c4a5ff1 ..\..\vpc_scripts\source_base.vpc -9587f360 ..\..\vpc_scripts\source_dll_win32_base.vpc +307760a1 ..\..\vpc_scripts\source_dll_win32_base.vpc 486b766d ..\..\vpc_scripts\version.vpc 846102f0 ..\..\vpc_scripts\loadaddress.vpc -9b8aa3b7 ..\..\vpc_scripts\source_dll_win32_debug.vpc -50782562 ..\..\vpc_scripts\source_dll_win32_release.vpc +0df0da71 ..\..\vpc_scripts\source_dll_win32_debug.vpc +7cf17fbc ..\..\vpc_scripts\source_dll_win32_release.vpc 34c37fcf ..\..\vpc_scripts\source_win32_base.vpc 346bda4a ..\..\vpc_scripts\source_video_base.vpc c209a88e ..\..\vpc_scripts\protobuf_builder.vpc diff --git a/sp/src/game/server/server_episodic.vpc b/sp/src/game/server/server_episodic.vpc index a7a5afd8..5b18ddf1 100644 --- a/sp/src/game/server/server_episodic.vpc +++ b/sp/src/game/server/server_episodic.vpc @@ -5,8 +5,7 @@ //----------------------------------------------------------------------------- $Macro SRCDIR "..\.." -$Macro GAMENAME1 "ep1chaos" -$Macro GAMENAME2 "ep2chaos" +$Macro GAMENAME "ep1chaos" $Include "$SRCDIR\game\server\server_base.vpc" diff --git a/sp/src/game/server/server_hl2.vcxproj b/sp/src/game/server/server_hl2.vcxproj index 47715505..cea50273 100644 --- a/sp/src/game/server/server_hl2.vcxproj +++ b/sp/src/game/server/server_hl2.vcxproj @@ -40,7 +40,7 @@ <_ProjectFileVersion>10.0.30319.1 .\Debug_hl2chaos\ - .\Debug_hl2chaos\ + .\Debughl2chaos\.\ .dll ..\..\devtools\vstools;$(ExecutablePath);$(Path) true @@ -49,7 +49,7 @@ false true .\Release_hl2chaos\ - .\Release_hl2chaos\ + .\Releasehl2chaos\.\ .dll ..\..\devtools\vstools;$(ExecutablePath);$(Path) true @@ -127,8 +127,8 @@ $(OutDir)/server.bsc - Publishing to ..\..\..\..\sourcemods\hl2chaos\bin\. and ..\..\..\..\sourcemods\hl2chaos\bin\. - if not exist "..\..\..\..\sourcemods\hl2chaos\bin\." mkdir "..\..\..\..\sourcemods\hl2chaos\bin\." copy "$(TargetDir)$(TargetFileName)" "..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetFileName)" if not exist "..\..\..\..\sourcemods\hl2chaos\bin\." mkdir "..\..\..\..\sourcemods\hl2chaos\bin\." copy "$(TargetDir)$(TargetFileName)" "..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetFileName)" if ERRORLEVEL 1 goto BuildEventFailed if exist "$(TargetDir)$(TargetName).map" copy "$(TargetDir)$(TargetName).map" ..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetName).map copy "$(TargetDir)$(TargetName).pdb" ..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetName).pdb if exist "$(TargetDir)$(TargetName).map" copy "$(TargetDir)$(TargetName).map" ..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetName).map copy "$(TargetDir)$(TargetName).pdb" ..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetName).pdb if ERRORLEVEL 1 goto BuildEventFailed goto BuildEventOK :BuildEventFailed echo *** ERROR! PostBuildStep FAILED for $(ProjectName)! EXE or DLL is probably running. *** del /q "$(TargetDir)$(TargetFileName)" exit 1 :BuildEventOK + Publishing to ..\..\..\..\sourcemods\hl2chaos\bin\. + if not exist "..\..\..\..\sourcemods\hl2chaos\bin\." mkdir "..\..\..\..\sourcemods\hl2chaos\bin\." copy "$(TargetDir)$(TargetFileName)" "..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetFileName)" if ERRORLEVEL 1 goto BuildEventFailed if exist "$(TargetDir)$(TargetName).map" copy "$(TargetDir)$(TargetName).map" ..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetName).map copy "$(TargetDir)$(TargetName).pdb" ..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetName).pdb if ERRORLEVEL 1 goto BuildEventFailed goto BuildEventOK :BuildEventFailed echo *** ERROR! PostBuildStep FAILED for $(ProjectName)! EXE or DLL is probably running. *** del /q "$(TargetDir)$(TargetFileName)" exit 1 :BuildEventOK @@ -207,8 +207,8 @@ $(OutDir)/server.bsc - Publishing to ..\..\..\..\sourcemods\hl2chaos\bin\. and ..\..\..\..\sourcemods\hl2chaos\bin\. - if not exist "..\..\..\..\sourcemods\hl2chaos\bin\." mkdir "..\..\..\..\sourcemods\hl2chaos\bin\." copy "$(TargetDir)$(TargetFileName)" "..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetFileName)" if not exist "..\..\..\..\sourcemods\hl2chaos\bin\." mkdir "..\..\..\..\sourcemods\hl2chaos\bin\." copy "$(TargetDir)$(TargetFileName)" "..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetFileName)" if ERRORLEVEL 1 goto BuildEventFailed if exist "$(TargetDir)$(TargetName).map" copy "$(TargetDir)$(TargetName).map" ..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetName).map copy "$(TargetDir)$(TargetName).pdb" ..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetName).pdb if exist "$(TargetDir)$(TargetName).map" copy "$(TargetDir)$(TargetName).map" ..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetName).map copy "$(TargetDir)$(TargetName).pdb" ..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetName).pdb if ERRORLEVEL 1 goto BuildEventFailed goto BuildEventOK :BuildEventFailed echo *** ERROR! PostBuildStep FAILED for $(ProjectName)! EXE or DLL is probably running. *** del /q "$(TargetDir)$(TargetFileName)" exit 1 :BuildEventOK + Publishing to ..\..\..\..\sourcemods\hl2chaos\bin\. + if not exist "..\..\..\..\sourcemods\hl2chaos\bin\." mkdir "..\..\..\..\sourcemods\hl2chaos\bin\." copy "$(TargetDir)$(TargetFileName)" "..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetFileName)" if ERRORLEVEL 1 goto BuildEventFailed if exist "$(TargetDir)$(TargetName).map" copy "$(TargetDir)$(TargetName).map" ..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetName).map copy "$(TargetDir)$(TargetName).pdb" ..\..\..\..\sourcemods\hl2chaos\bin\.\$(TargetName).pdb if ERRORLEVEL 1 goto BuildEventFailed goto BuildEventOK :BuildEventFailed echo *** ERROR! PostBuildStep FAILED for $(ProjectName)! EXE or DLL is probably running. *** del /q "$(TargetDir)$(TargetFileName)" exit 1 :BuildEventOK diff --git a/sp/src/game/server/server_hl2.vcxproj.vpc_crc b/sp/src/game/server/server_hl2.vcxproj.vpc_crc index f09303d0..a1dacadf 100644 --- a/sp/src/game/server/server_hl2.vcxproj.vpc_crc +++ b/sp/src/game/server/server_hl2.vcxproj.vpc_crc @@ -1,16 +1,16 @@ [vpc crc file version 2] 8209bbc3 C:\sourceproject\halflife2chaos\sp\src\devtools\bin\vpc.exe _Nc_VS2013/vpcgame:valve_ -7864ef4e server_hl2.vpc -e9d9ca9a ..\..\game\server\server_base.vpc +5634d0fa server_hl2.vpc +faeae84f ..\..\game\server\server_base.vpc 4832e67a ..\..\vpc_scripts\source_dll_base.vpc d752cf80 ..\..\vpc_scripts\platform_dirs.vpc 6c4a5ff1 ..\..\vpc_scripts\source_base.vpc -9587f360 ..\..\vpc_scripts\source_dll_win32_base.vpc +307760a1 ..\..\vpc_scripts\source_dll_win32_base.vpc 486b766d ..\..\vpc_scripts\version.vpc 846102f0 ..\..\vpc_scripts\loadaddress.vpc -9b8aa3b7 ..\..\vpc_scripts\source_dll_win32_debug.vpc -50782562 ..\..\vpc_scripts\source_dll_win32_release.vpc +0df0da71 ..\..\vpc_scripts\source_dll_win32_debug.vpc +7cf17fbc ..\..\vpc_scripts\source_dll_win32_release.vpc 34c37fcf ..\..\vpc_scripts\source_win32_base.vpc 346bda4a ..\..\vpc_scripts\source_video_base.vpc c209a88e ..\..\vpc_scripts\protobuf_builder.vpc diff --git a/sp/src/game/server/server_hl2.vpc b/sp/src/game/server/server_hl2.vpc index 7f7c93bd..d08e50ff 100644 --- a/sp/src/game/server/server_hl2.vpc +++ b/sp/src/game/server/server_hl2.vpc @@ -5,8 +5,7 @@ //----------------------------------------------------------------------------- $Macro SRCDIR "..\.." -$Macro GAMENAME1 "hl2chaos" -$Macro GAMENAME2 "hl2chaos" +$Macro GAMENAME "hl2chaos" $Include "$SRCDIR\game\server\server_base.vpc" diff --git a/sp/src/mathlib/mathlib.vcxproj b/sp/src/mathlib/mathlib.vcxproj index 6f438e99..aabe04b2 100644 --- a/sp/src/mathlib/mathlib.vcxproj +++ b/sp/src/mathlib/mathlib.vcxproj @@ -60,7 +60,7 @@ /Gw Disabled ..\common;..\public;..\public\tier0;..\public\tier1;..\public\mathlib - VPC;RAD_TELEMETRY_DISABLED;_HAS_ITERATOR_DEBUGGING=0;WIN32;_WIN32;_DEBUG;DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;%(PreprocessorDefinitions);COMPILER_MSVC32;COMPILER_MSVC32;COMPILER_MSVC;_DLL_EXT=.dll;LIBNAME=mathlib;BINK_VIDEO;AVI_VIDEO;WMV_VIDEO;DEV_BUILD;FRAME_POINTER_OMISSION_DISABLED;MATHLIB_LIB;_EXTERNAL_DLL_EXT=.dll;VPCGAMECAPS=VALVE;PROJECTDIR=C:\sourceproject\halflife2chaos\sp\src\mathlib;_DLL_EXT=.dll;SOURCE1=1;VPCGAME=valve + VPC;RAD_TELEMETRY_DISABLED;_HAS_ITERATOR_DEBUGGING=0;WIN32;_WIN32;_DEBUG;DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;%(PreprocessorDefinitions);COMPILER_MSVC32;COMPILER_MSVC32;COMPILER_MSVC;_DLL_EXT=.dll;LIBNAME=mathlib;BINK_VIDEO;AVI_VIDEO;WMV_VIDEO;DEV_BUILD;FRAME_POINTER_OMISSION_DISABLED;MATHLIB_LIB;_EXTERNAL_DLL_EXT=.dll;VPCGAMECAPS=VALVE;PROJECTDIR=C:\sourceproject\halflife2chaos\sp\src\mathlib;_DLL_EXT=.dll;VPCGAME=valve;SOURCE1=1 true false Default @@ -121,7 +121,7 @@ true Speed ..\common;..\public;..\public\tier0;..\public\tier1;..\public\mathlib - VPC;RAD_TELEMETRY_DISABLED;WIN32;_WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;%(PreprocessorDefinitions);COMPILER_MSVC32;COMPILER_MSVC32;COMPILER_MSVC;_DLL_EXT=.dll;LIBNAME=mathlib;BINK_VIDEO;AVI_VIDEO;WMV_VIDEO;DEV_BUILD;FRAME_POINTER_OMISSION_DISABLED;MATHLIB_LIB;_EXTERNAL_DLL_EXT=.dll;VPCGAMECAPS=VALVE;PROJECTDIR=C:\sourceproject\halflife2chaos\sp\src\mathlib;_DLL_EXT=.dll;SOURCE1=1;VPCGAME=valve + VPC;RAD_TELEMETRY_DISABLED;WIN32;_WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;%(PreprocessorDefinitions);COMPILER_MSVC32;COMPILER_MSVC32;COMPILER_MSVC;_DLL_EXT=.dll;LIBNAME=mathlib;BINK_VIDEO;AVI_VIDEO;WMV_VIDEO;DEV_BUILD;FRAME_POINTER_OMISSION_DISABLED;MATHLIB_LIB;_EXTERNAL_DLL_EXT=.dll;VPCGAMECAPS=VALVE;PROJECTDIR=C:\sourceproject\halflife2chaos\sp\src\mathlib;_DLL_EXT=.dll;VPCGAME=valve;SOURCE1=1 true false MultiThreaded diff --git a/sp/src/mathlib/mathlib.vcxproj.vpc_crc b/sp/src/mathlib/mathlib.vcxproj.vpc_crc index 95c45601..2f09b4c0 100644 --- a/sp/src/mathlib/mathlib.vcxproj.vpc_crc +++ b/sp/src/mathlib/mathlib.vcxproj.vpc_crc @@ -7,8 +7,8 @@ d752cf80 ..\vpc_scripts\platform_dirs.vpc 6c4a5ff1 ..\vpc_scripts\source_base.vpc 5dd0225a ..\vpc_scripts\source_lib_win32_base.vpc 486b766d ..\vpc_scripts\version.vpc -911b1eb4 ..\vpc_scripts\source_lib_win32_debug.vpc -2cceed75 ..\vpc_scripts\source_lib_win32_release.vpc +fe1ec01f ..\vpc_scripts\source_lib_win32_debug.vpc +e0f4e727 ..\vpc_scripts\source_lib_win32_release.vpc 34c37fcf ..\vpc_scripts\source_win32_base.vpc 346bda4a ..\vpc_scripts\source_video_base.vpc 30bf2216 ..\vpc_scripts\definitions\win32_2010.def diff --git a/sp/src/raytrace/raytrace.vcxproj.vpc_crc b/sp/src/raytrace/raytrace.vcxproj.vpc_crc index 7ce5c844..d37da063 100644 --- a/sp/src/raytrace/raytrace.vcxproj.vpc_crc +++ b/sp/src/raytrace/raytrace.vcxproj.vpc_crc @@ -7,8 +7,8 @@ d752cf80 ..\vpc_scripts\platform_dirs.vpc 6c4a5ff1 ..\vpc_scripts\source_base.vpc 5dd0225a ..\vpc_scripts\source_lib_win32_base.vpc 486b766d ..\vpc_scripts\version.vpc -911b1eb4 ..\vpc_scripts\source_lib_win32_debug.vpc -2cceed75 ..\vpc_scripts\source_lib_win32_release.vpc +fe1ec01f ..\vpc_scripts\source_lib_win32_debug.vpc +e0f4e727 ..\vpc_scripts\source_lib_win32_release.vpc 34c37fcf ..\vpc_scripts\source_win32_base.vpc 346bda4a ..\vpc_scripts\source_video_base.vpc 30bf2216 ..\vpc_scripts\definitions\win32_2010.def diff --git a/sp/src/tier1/tier1.vcxproj b/sp/src/tier1/tier1.vcxproj index ff15f7c7..f1d5acd2 100644 --- a/sp/src/tier1/tier1.vcxproj +++ b/sp/src/tier1/tier1.vcxproj @@ -60,7 +60,7 @@ /Gw Disabled ..\common;..\public;..\public\tier0;..\public\tier1 - VPC;RAD_TELEMETRY_DISABLED;_HAS_ITERATOR_DEBUGGING=0;WIN32;_WIN32;_DEBUG;DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;%(PreprocessorDefinitions);COMPILER_MSVC32;COMPILER_MSVC32;COMPILER_MSVC;_DLL_EXT=.dll;LIBNAME=tier1;BINK_VIDEO;AVI_VIDEO;WMV_VIDEO;DEV_BUILD;FRAME_POINTER_OMISSION_DISABLED;TIER1_STATIC_LIB;_EXTERNAL_DLL_EXT=.dll;VPCGAMECAPS=VALVE;PROJECTDIR=C:\sourceproject\halflife2chaos\sp\src\tier1;_DLL_EXT=.dll;SOURCE1=1;VPCGAME=valve + VPC;RAD_TELEMETRY_DISABLED;_HAS_ITERATOR_DEBUGGING=0;WIN32;_WIN32;_DEBUG;DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;%(PreprocessorDefinitions);COMPILER_MSVC32;COMPILER_MSVC32;COMPILER_MSVC;_DLL_EXT=.dll;LIBNAME=tier1;BINK_VIDEO;AVI_VIDEO;WMV_VIDEO;DEV_BUILD;FRAME_POINTER_OMISSION_DISABLED;TIER1_STATIC_LIB;_EXTERNAL_DLL_EXT=.dll;VPCGAMECAPS=VALVE;PROJECTDIR=C:\sourceproject\halflife2chaos\sp\src\tier1;_DLL_EXT=.dll;VPCGAME=valve;SOURCE1=1 true false Default @@ -122,7 +122,7 @@ true Speed ..\common;..\public;..\public\tier0;..\public\tier1 - VPC;RAD_TELEMETRY_DISABLED;WIN32;_WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;%(PreprocessorDefinitions);COMPILER_MSVC32;COMPILER_MSVC32;COMPILER_MSVC;_DLL_EXT=.dll;LIBNAME=tier1;BINK_VIDEO;AVI_VIDEO;WMV_VIDEO;DEV_BUILD;FRAME_POINTER_OMISSION_DISABLED;TIER1_STATIC_LIB;_EXTERNAL_DLL_EXT=.dll;VPCGAMECAPS=VALVE;PROJECTDIR=C:\sourceproject\halflife2chaos\sp\src\tier1;_DLL_EXT=.dll;SOURCE1=1;VPCGAME=valve + VPC;RAD_TELEMETRY_DISABLED;WIN32;_WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;%(PreprocessorDefinitions);COMPILER_MSVC32;COMPILER_MSVC32;COMPILER_MSVC;_DLL_EXT=.dll;LIBNAME=tier1;BINK_VIDEO;AVI_VIDEO;WMV_VIDEO;DEV_BUILD;FRAME_POINTER_OMISSION_DISABLED;TIER1_STATIC_LIB;_EXTERNAL_DLL_EXT=.dll;VPCGAMECAPS=VALVE;PROJECTDIR=C:\sourceproject\halflife2chaos\sp\src\tier1;_DLL_EXT=.dll;VPCGAME=valve;SOURCE1=1 true false MultiThreaded diff --git a/sp/src/tier1/tier1.vcxproj.vpc_crc b/sp/src/tier1/tier1.vcxproj.vpc_crc index 022c0cc7..231ce47a 100644 --- a/sp/src/tier1/tier1.vcxproj.vpc_crc +++ b/sp/src/tier1/tier1.vcxproj.vpc_crc @@ -7,8 +7,8 @@ d752cf80 ..\vpc_scripts\platform_dirs.vpc 6c4a5ff1 ..\vpc_scripts\source_base.vpc 5dd0225a ..\vpc_scripts\source_lib_win32_base.vpc 486b766d ..\vpc_scripts\version.vpc -911b1eb4 ..\vpc_scripts\source_lib_win32_debug.vpc -2cceed75 ..\vpc_scripts\source_lib_win32_release.vpc +fe1ec01f ..\vpc_scripts\source_lib_win32_debug.vpc +e0f4e727 ..\vpc_scripts\source_lib_win32_release.vpc 34c37fcf ..\vpc_scripts\source_win32_base.vpc 346bda4a ..\vpc_scripts\source_video_base.vpc 30bf2216 ..\vpc_scripts\definitions\win32_2010.def diff --git a/sp/src/vgui2/vgui_controls/vgui_controls.vcxproj.vpc_crc b/sp/src/vgui2/vgui_controls/vgui_controls.vcxproj.vpc_crc index 22d6ec51..03bbccf9 100644 --- a/sp/src/vgui2/vgui_controls/vgui_controls.vcxproj.vpc_crc +++ b/sp/src/vgui2/vgui_controls/vgui_controls.vcxproj.vpc_crc @@ -7,8 +7,8 @@ d752cf80 ..\..\vpc_scripts\platform_dirs.vpc 6c4a5ff1 ..\..\vpc_scripts\source_base.vpc 5dd0225a ..\..\vpc_scripts\source_lib_win32_base.vpc 486b766d ..\..\vpc_scripts\version.vpc -911b1eb4 ..\..\vpc_scripts\source_lib_win32_debug.vpc -2cceed75 ..\..\vpc_scripts\source_lib_win32_release.vpc +fe1ec01f ..\..\vpc_scripts\source_lib_win32_debug.vpc +e0f4e727 ..\..\vpc_scripts\source_lib_win32_release.vpc 34c37fcf ..\..\vpc_scripts\source_win32_base.vpc 346bda4a ..\..\vpc_scripts\source_video_base.vpc c209a88e ..\..\vpc_scripts\protobuf_builder.vpc diff --git a/sp/src/vpc_scripts/source_dll_win32_base.vpc b/sp/src/vpc_scripts/source_dll_win32_base.vpc index 021879ad..e9270907 100644 --- a/sp/src/vpc_scripts/source_dll_win32_base.vpc +++ b/sp/src/vpc_scripts/source_dll_win32_base.vpc @@ -8,11 +8,9 @@ $Include "$SRCDIR\vpc_scripts\version.vpc" $MacroRequired "SRCDIR" $MacroRequired "OUTBINNAME" "$PROJECTNAME" -$MacroRequired "OUTBINDIR1" -$MacroRequired "OUTBINDIR2" +$MacroRequired "OUTBINDIR" -$Macro OUTBINDIR1 "$OUTBINDIR1$PLATSUBDIR" -$Macro OUTBINDIR2 "$OUTBINDIR2$PLATSUBDIR" +$Macro OUTBINDIR "$OUTBINDIR$PLATSUBDIR" $Macro LIBPUBLIC "$SRCDIR\lib\public$PLATSUBDIR" $Macro LIBCOMMON "$SRCDIR\lib\common$PLATSUBDIR" @@ -57,11 +55,7 @@ $Configuration $PreBuildEvent { - $CommandLine "if EXIST $OUTBINDIR1\$(TargetFileName) for /f $QUOTEdelims=$QUOTE %%A in ('attrib $QUOTE$OUTBINDIR1\$(TargetFileName)$QUOTE') do set valveTmpIsReadOnly=$QUOTE%%A$QUOTE" "\n" \ - "set valveTmpIsReadOnlyLetter=%valveTmpIsReadOnly:~6,1%" "\n" \ - "if $QUOTE%valveTmpIsReadOnlyLetter%$QUOTE==$QUOTER$QUOTE del /q $QUOTE$(TargetDir)$QUOTE$(TargetFileName)" "\n" \ - "$CRCCHECK" "\n" - $CommandLine "if EXIST $OUTBINDIR2\$(TargetFileName) for /f $QUOTEdelims=$QUOTE %%A in ('attrib $QUOTE$OUTBINDIR2\$(TargetFileName)$QUOTE') do set valveTmpIsReadOnly=$QUOTE%%A$QUOTE" "\n" \ + $CommandLine "if EXIST $OUTBINDIR\$(TargetFileName) for /f $QUOTEdelims=$QUOTE %%A in ('attrib $QUOTE$OUTBINDIR\$(TargetFileName)$QUOTE') do set valveTmpIsReadOnly=$QUOTE%%A$QUOTE" "\n" \ "set valveTmpIsReadOnlyLetter=%valveTmpIsReadOnly:~6,1%" "\n" \ "if $QUOTE%valveTmpIsReadOnlyLetter%$QUOTE==$QUOTER$QUOTE del /q $QUOTE$(TargetDir)$QUOTE$(TargetFileName)" "\n" \ "$CRCCHECK" "\n" @@ -69,15 +63,11 @@ $Configuration $PostBuildEvent [!$ANALYZE] { - $CommandLine "if not exist $QUOTE$OUTBINDIR1$QUOTE mkdir $QUOTE$OUTBINDIR1$QUOTE" "\n" - $CommandLine "$BASE" "copy $QUOTE$(TargetDir)$(TargetFileName)$QUOTE $QUOTE$OUTBINDIR1\$(TargetFileName)$QUOTE" "\n" \ - "if not exist $QUOTE$OUTBINDIR2$QUOTE mkdir $QUOTE$OUTBINDIR2$QUOTE" "\n" - $CommandLine "$BASE" "copy $QUOTE$(TargetDir)$(TargetFileName)$QUOTE $QUOTE$OUTBINDIR2\$(TargetFileName)$QUOTE" "\n" \ + $CommandLine "if not exist $QUOTE$OUTBINDIR$QUOTE mkdir $QUOTE$OUTBINDIR$QUOTE" "\n" + $CommandLine "$BASE" "copy $QUOTE$(TargetDir)$(TargetFileName)$QUOTE $QUOTE$OUTBINDIR\$(TargetFileName)$QUOTE" "\n" \ "if ERRORLEVEL 1 goto BuildEventFailed" "\n" \ - "if exist $QUOTE$(TargetDir)$(TargetName).map$QUOTE copy $QUOTE$(TargetDir)$(TargetName).map$QUOTE $OUTBINDIR1\$(TargetName).map" "\n" - $CommandLine "$BASE" "copy $QUOTE$(TargetDir)$(TargetName).pdb$QUOTE $OUTBINDIR1\$(TargetName).pdb" "\n" \ - "if exist $QUOTE$(TargetDir)$(TargetName).map$QUOTE copy $QUOTE$(TargetDir)$(TargetName).map$QUOTE $OUTBINDIR2\$(TargetName).map" "\n" - $CommandLine "$BASE" "copy $QUOTE$(TargetDir)$(TargetName).pdb$QUOTE $OUTBINDIR2\$(TargetName).pdb" "\n" \ + "if exist $QUOTE$(TargetDir)$(TargetName).map$QUOTE copy $QUOTE$(TargetDir)$(TargetName).map$QUOTE $OUTBINDIR\$(TargetName).map" "\n" + $CommandLine "$BASE" "copy $QUOTE$(TargetDir)$(TargetName).pdb$QUOTE $OUTBINDIR\$(TargetName).pdb" "\n" \ "if ERRORLEVEL 1 goto BuildEventFailed" "\n" \ "goto BuildEventOK" "\n" \ ":BuildEventFailed" "\n" \ @@ -86,7 +76,7 @@ $Configuration "exit 1" "\n" \ ":BuildEventOK" "\n" - $Description "Publishing to $OUTBINDIR1 and $OUTBINDIR2" + $Description "Publishing to $OUTBINDIR" $ExcludedFromBuild "No" } } diff --git a/sp/src/vpc_scripts/source_dll_win32_debug.vpc b/sp/src/vpc_scripts/source_dll_win32_debug.vpc index 54996cb2..c5b786d2 100644 --- a/sp/src/vpc_scripts/source_dll_win32_debug.vpc +++ b/sp/src/vpc_scripts/source_dll_win32_debug.vpc @@ -8,17 +8,15 @@ $IgnoreRedundancyWarning "ON" $MacroRequired "SRCDIR" $MacroRequired "OUTBINNAME" -$MacroRequired "OUTBINDIR1" -$MacroRequired "OUTBINDIR2" +$MacroRequired "OUTBINDIR" $MacroRequired "LIBPUBLIC" $MacroRequired "LIBCOMMON" $MacroRequired "PLATSUBDIR" $MacroRequired "OUTDLLEXT" -$MacroRequiredAllowEmpty "GAMENAME1" -$MacroRequiredAllowEmpty "GAMENAME2" +$MacroRequiredAllowEmpty "GAMENAME" $MacroRequiredAllowEmpty "INTERMEDIATESUBDIR" $MacroRequiredAllowEmpty "_UNITYSUBDIR" -$Macro "_SUBDIRSUFFIX" "$INTERMEDIATESUBDIR$GAMENAME1$PLATSUBDIR$_UNITYSUBDIR" +$Macro "_SUBDIRSUFFIX" "$INTERMEDIATESUBDIR$GAMENAME$PLATSUBDIR$_UNITYSUBDIR" $Configuration "Debug" { diff --git a/sp/src/vpc_scripts/source_dll_win32_release.vpc b/sp/src/vpc_scripts/source_dll_win32_release.vpc index 689d98de..880e5efc 100644 --- a/sp/src/vpc_scripts/source_dll_win32_release.vpc +++ b/sp/src/vpc_scripts/source_dll_win32_release.vpc @@ -12,17 +12,15 @@ $Macro NOFPO "1" $MacroRequired "SRCDIR" $MacroRequired "OUTBINNAME" -$MacroRequired "OUTBINDIR1" -$MacroRequired "OUTBINDIR2" +$MacroRequired "OUTBINDIR" $MacroRequired "LIBPUBLIC" $MacroRequired "LIBCOMMON" $MacroRequired "PLATSUBDIR" $MacroRequired "OUTDLLEXT" -$MacroRequiredAllowEmpty "GAMENAME1" -$MacroRequiredAllowEmpty "GAMENAME2" +$MacroRequiredAllowEmpty "GAMENAME" $MacroRequiredAllowEmpty "INTERMEDIATESUBDIR" $MacroRequiredAllowEmpty "_UNITYSUBDIR" -$Macro "_SUBDIRSUFFIX" "$INTERMEDIATESUBDIR$GAMENAME1$PLATSUBDIR$_UNITYSUBDIR" +$Macro "_SUBDIRSUFFIX" "$INTERMEDIATESUBDIR$GAMENAME$PLATSUBDIR$_UNITYSUBDIR" $Configuration "Release" { diff --git a/sp/src/vpc_scripts/source_lib_win32_debug.vpc b/sp/src/vpc_scripts/source_lib_win32_debug.vpc index affb397c..d179ecef 100644 --- a/sp/src/vpc_scripts/source_lib_win32_debug.vpc +++ b/sp/src/vpc_scripts/source_lib_win32_debug.vpc @@ -12,12 +12,11 @@ $MacroRequired "OUTLIBDIR" $MacroRequired "LIBPUBLIC" $MacroRequired "LIBCOMMON" $MacroRequired "PLATSUBDIR" -$MacroRequiredAllowEmpty "GAMENAME1" -$MacroRequiredAllowEmpty "GAMENAME2" +$MacroRequiredAllowEmpty "GAMENAME" $MacroRequiredAllowEmpty "INTERMEDIATESUBDIR" $MacroRequiredAllowEmpty "_UNITYSUBDIR" $MacroRequiredAllowEmpty "_STATICSUBDIR" -$Macro "_SUBDIRSUFFIX" "$INTERMEDIATESUBDIR$_STATICSUBDIR$GAMENAME1$PLATSUBDIR$_UNITYSUBDIR" +$Macro "_SUBDIRSUFFIX" "$INTERMEDIATESUBDIR$_STATICSUBDIR$GAMENAME$PLATSUBDIR$_UNITYSUBDIR" $Configuration "Debug" { diff --git a/sp/src/vpc_scripts/source_lib_win32_release.vpc b/sp/src/vpc_scripts/source_lib_win32_release.vpc index acfa3a8c..cbfe4cab 100644 --- a/sp/src/vpc_scripts/source_lib_win32_release.vpc +++ b/sp/src/vpc_scripts/source_lib_win32_release.vpc @@ -16,12 +16,11 @@ $MacroRequired "OUTLIBDIR" $MacroRequired "LIBPUBLIC" $MacroRequired "LIBCOMMON" $MacroRequired "PLATSUBDIR" -$MacroRequiredAllowEmpty "GAMENAME1" -$MacroRequiredAllowEmpty "GAMENAME2" +$MacroRequiredAllowEmpty "GAMENAME" $MacroRequiredAllowEmpty "INTERMEDIATESUBDIR" $MacroRequiredAllowEmpty "_UNITYSUBDIR" $MacroRequiredAllowEmpty "_STATICSUBDIR" -$Macro "_SUBDIRSUFFIX" "$INTERMEDIATESUBDIR$_STATICSUBDIR$GAMENAME1$PLATSUBDIR$_UNITYSUBDIR" +$Macro "_SUBDIRSUFFIX" "$INTERMEDIATESUBDIR$_STATICSUBDIR$GAMENAME$PLATSUBDIR$_UNITYSUBDIR" $Configuration "Release" {