From 77b376f8a0d8d172c51729762f80bb394534aa41 Mon Sep 17 00:00:00 2001 From: Joe Ludwig Date: Thu, 4 Jul 2013 11:20:31 -0700 Subject: * Switched the SDK from checked-in projects to VPC, the Valve Project Creator. See the Getting Started document on the wiki for details. * Pulled in bug fixes from HL2 and HL2MP. --- .../captioncompiler/captioncompiler-2010.vcxproj | 261 --------------------- .../captioncompiler-2010.vcxproj.filters | 110 --------- mp/src/utils/captioncompiler/captioncompiler.vpc | 60 +++++ 3 files changed, 60 insertions(+), 371 deletions(-) delete mode 100644 mp/src/utils/captioncompiler/captioncompiler-2010.vcxproj delete mode 100644 mp/src/utils/captioncompiler/captioncompiler-2010.vcxproj.filters create mode 100644 mp/src/utils/captioncompiler/captioncompiler.vpc (limited to 'mp/src/utils/captioncompiler') diff --git a/mp/src/utils/captioncompiler/captioncompiler-2010.vcxproj b/mp/src/utils/captioncompiler/captioncompiler-2010.vcxproj deleted file mode 100644 index 47767523..00000000 --- a/mp/src/utils/captioncompiler/captioncompiler-2010.vcxproj +++ /dev/null @@ -1,261 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Captioncompiler - {E85D01E5-DA1B-00A2-5D72-A9B6DEA9A995} - - - - Application - MultiByte - captioncompiler - - - Application - MultiByte - captioncompiler - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\Debug\win32\ - .\Debug\win32\ - ..\..\devtools\vstools;$(ExecutablePath);$(Path) - true - true - true - true - true - .\Release\win32\ - .\Release\win32\ - ..\..\devtools\vstools;$(ExecutablePath);$(Path) - true - true - false - true - true - - - - if EXIST ..\..\..\game\bin\$(TargetFileName) for /f "delims=" %%A in ('attrib "..\..\..\game\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 captioncompiler.vcxproj if ERRORLEVEL 1 exit 1 - - - /MP - Disabled - ..\..\common;..\..\public;..\..\public\tier0;..\..\public\tier1;..\common;..\..\game\shared;.\ - _HAS_ITERATOR_DEBUGGING=0;WIN32;_WIN32;_DEBUG;DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;RAD_TELEMETRY_DISABLED;COMPILER_MSVC32;captioncompiler;VPCGAMECAPS=VALVE;PROJECTDIR=D:\dev\games\rel\hl2\src\utils\captioncompiler;_DLL_EXT=.dll;VPCGAME=valve - true - false - Default - MultiThreadedDebug - true - StreamingSIMDExtensions - Fast - true - true - true - false - NotUsing - false - NoListing - $(IntDir)/ - $(IntDir)/ - $(IntDir)/ - false - Level4 - true - EditAndContinue - CompileAsCpp - $(IntDir)/ - Prompt - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE - 1033 - - - - - /NXCOMPAT /ignore:4221 - %(AdditionalDependencies) - NotSet - $(OutDir)\captioncompiler.exe - true - libc;libcd;libcmt - true - $(IntDir)/$(TargetName).pdb - false - $(IntDir)/$(TargetName).map - Console - - MachineX86 - PromptImmediately - false - - - true - - - true - - - true - $(OutDir)/captioncompiler.bsc - - - Publishing to ..\..\..\game\bin - if not exist "..\..\..\game\bin" mkdir "..\..\..\game\bin" copy "$(TargetDir)"$(TargetFileName) ..\..\..\game\bin\$(TargetFileName) if ERRORLEVEL 1 goto BuildEventFailed if exist "$(TargetDir)"$(TargetName).map copy "$(TargetDir)"$(TargetName).map ..\..\..\game\bin\$(TargetName).map copy "$(TargetDir)"$(TargetName).pdb ..\..\..\game\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 ..\..\..\game\bin\$(TargetFileName) for /f "delims=" %%A in ('attrib "..\..\..\game\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 captioncompiler.vcxproj if ERRORLEVEL 1 exit 1 - - - /MP /d2Zi+ - MaxSpeed - AnySuitable - true - Speed - ..\..\common;..\..\public;..\..\public\tier0;..\..\public\tier1;..\common;..\..\game\shared;.\ - WIN32;_WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;RAD_TELEMETRY_DISABLED;COMPILER_MSVC32;captioncompiler;VPCGAMECAPS=VALVE;PROJECTDIR=D:\dev\games\rel\hl2\src\utils\captioncompiler;_DLL_EXT=.dll;VPCGAME=valve - true - false - MultiThreaded - false - true - StreamingSIMDExtensions - Fast - true - true - true - false - NotUsing - false - NoListing - $(IntDir)/ - $(IntDir)/ - $(IntDir)/ - false - Level4 - true - ProgramDatabase - CompileAsCpp - $(IntDir)/ - Prompt - - - NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE - 1033 - - - - - /DYNAMICBASE /NXCOMPAT /ignore:4221 - %(AdditionalDependencies) - NotSet - $(OutDir)\captioncompiler.exe - true - libc;libcd;libcmtd - true - $(IntDir)/$(TargetName).pdb - false - $(IntDir)/$(TargetName).map - Console - true - true - - MachineX86 - PromptImmediately - - - true - - - true - - - true - $(OutDir)/captioncompiler.bsc - - - Publishing to ..\..\..\game\bin - if not exist "..\..\..\game\bin" mkdir "..\..\..\game\bin" copy "$(TargetDir)"$(TargetFileName) ..\..\..\game\bin\$(TargetFileName) if ERRORLEVEL 1 goto BuildEventFailed if exist "$(TargetDir)"$(TargetName).map copy "$(TargetDir)"$(TargetName).map ..\..\..\game\bin\$(TargetName).map copy "$(TargetDir)"$(TargetName).pdb ..\..\..\game\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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NotUsing - NotUsing - - - - - - - Compiling pointeroverride.asm - "$(VCInstallDir)bin\ml.exe" /c /Cp /Zi /Fo"$(IntDir)\%(Filename).obj" "%(FullPath)" - $(IntDir)\%(Filename).obj - Compiling pointeroverride.asm - "$(VCInstallDir)bin\ml.exe" /c /Cp /Zi /Fo"$(IntDir)\%(Filename).obj" "%(FullPath)" - $(IntDir)\%(Filename).obj - - - - - - - - diff --git a/mp/src/utils/captioncompiler/captioncompiler-2010.vcxproj.filters b/mp/src/utils/captioncompiler/captioncompiler-2010.vcxproj.filters deleted file mode 100644 index 3e16f2b4..00000000 --- a/mp/src/utils/captioncompiler/captioncompiler-2010.vcxproj.filters +++ /dev/null @@ -1,110 +0,0 @@ - - - - - {1680C80B-FF1E-EA4D-9817-CC12254F2E40} - - - {C5D73B3A-C648-896C-B7CE-F174808E5BA5} - - - {C0A65B3F-3B05-094C-44FA-B1624BAD7BAC} - - - {BA03E055-4FA2-FCE3-8A1C-D348547D379C} - - - - - Link Libraries - - - Link Libraries - - - Link Libraries - - - Link Libraries - - - Link Libraries - - - Link Libraries - - - Link Libraries - - - - - Header Files - - - Header Files - - - Shared Code - - - Shared Code - - - Shared Code - - - Shared Code - - - Shared Code - - - Shared Code - - - Shared Code - - - - - Shared Code - - - Shared Code - - - Shared Code - - - Shared Code - - - Shared Code - - - Shared Code - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - - - Source Files - - - - - diff --git a/mp/src/utils/captioncompiler/captioncompiler.vpc b/mp/src/utils/captioncompiler/captioncompiler.vpc new file mode 100644 index 00000000..6d60fabe --- /dev/null +++ b/mp/src/utils/captioncompiler/captioncompiler.vpc @@ -0,0 +1,60 @@ +//----------------------------------------------------------------------------- +// CAPTIONCOMPILER.VPC +// +// Project Script +//----------------------------------------------------------------------------- + +$Macro SRCDIR "..\.." +$Macro OUTBINDIR "$SRCDIR\..\game\bin" + +$Include "$SRCDIR\vpc_scripts\source_exe_con_win32_base.vpc" + +$Configuration +{ + $Compiler + { + $AdditionalIncludeDirectories "$BASE,..\common,$SRCDIR\game\shared,.\" + $PreprocessorDefinitions "$BASE;captioncompiler" + } +} + +$Project "Captioncompiler" +{ + $Folder "Source Files" + { + $File "captioncompiler.cpp" + $File "$SRCDIR\common\compiledcaptionswap.cpp" + $File "..\common\filesystem_tools.cpp" + } + + $Folder "Header Files" + { + $File "cbase.h" + $File "..\common\filesystem_tools.h" + } + + $Folder "Shared Code" + { + $File "..\common\cmdlib.cpp" + $File "..\common\cmdlib.h" + $File "$SRCDIR\public\filesystem_helpers.cpp" + $File "$SRCDIR\public\filesystem_helpers.h" + $File "$SRCDIR\public\filesystem_init.cpp" + $File "$SRCDIR\public\filesystem_init.h" + $File "$SRCDIR\public\mathlib\mathlib.h" + $File "..\common\pacifier.cpp" + $File "..\common\pacifier.h" + $File "..\common\scriplib.cpp" + $File "..\common\scriplib.h" + $File "$SRCDIR\public\stringregistry.cpp" + $File "$SRCDIR\public\stringregistry.h" + } + + $Folder "Link Libraries" + { + $DynamicFile "$SRCDIR\lib\public\appframework.lib" + $DynamicFile "$SRCDIR\lib\public\mathlib.lib" + $DynamicFile "$SRCDIR\lib\public\tier2.lib" + $DynamicFile "$SRCDIR\lib\public\tier3.lib" + } +} -- cgit v1.2.3