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. --- mp/src/utils/vbsp/vbsp-2010.vcxproj | 371 ----------------------- mp/src/utils/vbsp/vbsp-2010.vcxproj.filters | 446 ---------------------------- mp/src/utils/vbsp/vbsp.vpc | 184 ++++++++++++ 3 files changed, 184 insertions(+), 817 deletions(-) delete mode 100644 mp/src/utils/vbsp/vbsp-2010.vcxproj delete mode 100644 mp/src/utils/vbsp/vbsp-2010.vcxproj.filters create mode 100644 mp/src/utils/vbsp/vbsp.vpc (limited to 'mp/src/utils/vbsp') diff --git a/mp/src/utils/vbsp/vbsp-2010.vcxproj b/mp/src/utils/vbsp/vbsp-2010.vcxproj deleted file mode 100644 index 9719c104..00000000 --- a/mp/src/utils/vbsp/vbsp-2010.vcxproj +++ /dev/null @@ -1,371 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Vbsp - {E4F39B89-9731-571D-B69D-C1B8FE56C056} - - - - Application - MultiByte - vbsp - - - Application - MultiByte - vbsp - - - - - - - - - - - - - <_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 vbsp.vcxproj if ERRORLEVEL 1 exit 1 - - - /MP - Disabled - ..\..\common;..\..\public;..\..\public\tier0;..\..\public\tier1;..\common;..\vmpi - _HAS_ITERATOR_DEBUGGING=0;WIN32;_WIN32;_DEBUG;DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;RAD_TELEMETRY_DISABLED;COMPILER_MSVC32;MACRO_MATHLIB;PROTECTED_THINGS_DISABLE;VPCGAMECAPS=VALVE;PROJECTDIR=D:\dev\games\rel\hl2\src\utils\vbsp;_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);ws2_32.lib;odbc32.lib;odbccp32.lib;winmm.lib - NotSet - $(OutDir)\vbsp.exe - true - libc;libcd;libcmt - true - $(IntDir)/$(TargetName).pdb - false - $(IntDir)/$(TargetName).map - Console - - MachineX86 - PromptImmediately - false - - - true - - - true - - - true - $(OutDir)/vbsp.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 vbsp.vcxproj if ERRORLEVEL 1 exit 1 - - - /MP /d2Zi+ - MaxSpeed - AnySuitable - true - Speed - ..\..\common;..\..\public;..\..\public\tier0;..\..\public\tier1;..\common;..\vmpi - WIN32;_WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;RAD_TELEMETRY_DISABLED;COMPILER_MSVC32;MACRO_MATHLIB;PROTECTED_THINGS_DISABLE;VPCGAMECAPS=VALVE;PROJECTDIR=D:\dev\games\rel\hl2\src\utils\vbsp;_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);ws2_32.lib;odbc32.lib;odbccp32.lib;winmm.lib - NotSet - $(OutDir)\vbsp.exe - true - libc;libcd;libcmtd - true - $(IntDir)/$(TargetName).pdb - false - $(IntDir)/$(TargetName).map - Console - true - true - - MachineX86 - PromptImmediately - - - true - - - true - - - true - $(OutDir)/vbsp.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/vbsp/vbsp-2010.vcxproj.filters b/mp/src/utils/vbsp/vbsp-2010.vcxproj.filters deleted file mode 100644 index 64aedaa4..00000000 --- a/mp/src/utils/vbsp/vbsp-2010.vcxproj.filters +++ /dev/null @@ -1,446 +0,0 @@ - - - - - {1680C80B-FF1E-EA4D-9817-CC12254F2E40} - - - {34125DCB-B916-13A4-10E6-A29CCCB0DD70} - - - {C5D73B3A-C648-896C-B7CE-F174808E5BA5} - - - {70104EB0-EB8F-8C16-99FB-ED7579D3A29D} - - - {BA03E055-4FA2-FCE3-8A1C-D348547D379C} - - - {A7DC6913-C602-1488-0EDF-DE69D12F2421} - - - - - Link Libraries - - - Link Libraries - - - Link Libraries - - - Link Libraries - - - Link Libraries - - - Link Libraries - - - Link Libraries - - - Link Libraries - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\Common header files - - - Header Files\Common header files - - - Header Files\Common header files - - - Header Files\Common header files - - - Header Files\Common header files - - - Header Files\Common header files - - - Header Files\Common header files - - - Header Files\Common header files - - - Header Files\Common header files - - - Header Files\Common header files - - - Header Files\Common header files - - - Header Files\Common header files - - - Header Files\Common header files - - - Header Files\Common header files - - - Header Files\Common header files - - - Header Files\Common header files - - - Header Files\Common header files - - - Header Files\Common header files - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Public Headers - - - Source Files\Common Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\Common Files - - - Source Files\Common Files - - - Source Files\Common Files - - - Source Files\Common Files - - - Source Files\Common Files - - - Source Files\Common Files - - - Source Files\Common Files - - - Source Files\Common Files - - - Source Files\Common Files - - - Source Files\Common Files - - - Source Files\Common Files - - - Source Files\Common Files - - - Source Files\Common Files - - - - - - - Source Files - - - - - - - - diff --git a/mp/src/utils/vbsp/vbsp.vpc b/mp/src/utils/vbsp/vbsp.vpc new file mode 100644 index 00000000..10fc9db1 --- /dev/null +++ b/mp/src/utils/vbsp/vbsp.vpc @@ -0,0 +1,184 @@ +//----------------------------------------------------------------------------- +// VBSP.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,..\vmpi" + $PreprocessorDefinitions "$BASE;MACRO_MATHLIB;PROTECTED_THINGS_DISABLE" + } + + $Linker + { + $AdditionalDependencies "$BASE ws2_32.lib odbc32.lib odbccp32.lib winmm.lib" + } +} + +$Project "Vbsp" +{ + $Folder "Source Files" + { + $File "boundbox.cpp" + $File "brushbsp.cpp" + $File "$SRCDIR\public\CollisionUtils.cpp" + $File "csg.cpp" + $File "cubemap.cpp" + $File "detail.cpp" + $File "detailObjects.cpp" + $File "$SRCDIR\public\disp_common.cpp" + $File "disp_ivp.cpp" + $File "$SRCDIR\public\disp_powerinfo.cpp" + $File "disp_vbsp.cpp" + $File "faces.cpp" + $File "glfile.cpp" + $File "ivp.cpp" + $File "leakfile.cpp" + $File "$SRCDIR\public\loadcmdline.cpp" + $File "$SRCDIR\public\lumpfiles.cpp" + $File "map.cpp" + $File "manifest.cpp" + $File "materialpatch.cpp" + $File "materialsub.cpp" + $File "..\common\mstristrip.cpp" + $File "nodraw.cpp" + $File "normals.cpp" + $File "overlay.cpp" + $File "..\common\physdll.cpp" + $File "portals.cpp" + $File "prtfile.cpp" + $File "$SRCDIR\public\ScratchPad3D.cpp" + $File "..\common\scratchpad_helpers.cpp" + $File "StaticProp.cpp" + $File "textures.cpp" + $File "tree.cpp" + $File "..\common\utilmatlib.cpp" + $File "vbsp.cpp" + $File "worldvertextransitionfixup.cpp" + $File "writebsp.cpp" + $File "$SRCDIR\public\zip_utils.cpp" + + $Folder "Common Files" + { + $File "..\common\bsplib.cpp" + $File "$SRCDIR\public\builddisp.cpp" + $File "$SRCDIR\public\ChunkFile.cpp" + $File "..\common\cmdlib.cpp" + $File "$SRCDIR\public\filesystem_helpers.cpp" + $File "$SRCDIR\public\filesystem_init.cpp" + $File "..\common\filesystem_tools.cpp" + $File "..\common\map_shared.cpp" + $File "..\common\pacifier.cpp" + $File "..\common\polylib.cpp" + $File "..\common\scriplib.cpp" + $File "..\common\threads.cpp" + $File "..\common\tools_minidump.cpp" + $File "..\common\tools_minidump.h" + } + } + + $Folder "Header Files" + { + $File "boundbox.h" + $File "csg.h" + $File "detail.h" + $File "$SRCDIR\public\disp_powerinfo.h" + $File "disp_vbsp.h" + $File "$SRCDIR\public\disp_vertindex.h" + $File "faces.h" + $File "map.h" + $File "manifest.h" + $File "materialpatch.h" + $File "materialsub.h" + $File "..\common\scratchpad_helpers.h" + $File "vbsp.h" + $File "worldvertextransitionfixup.h" + $File "writebsp.h" + + $Folder "Common header files" + { + $File "..\common\bsplib.h" + $File "$SRCDIR\public\builddisp.h" + $File "$SRCDIR\public\ChunkFile.h" + $File "..\common\cmdlib.h" + $File "disp_ivp.h" + $File "$SRCDIR\public\filesystem.h" + $File "$SRCDIR\public\filesystem_helpers.h" + $File "..\common\FileSystem_Tools.h" + $File "$SRCDIR\public\GameBSPFile.h" + $File "$SRCDIR\public\tier1\interface.h" + $File "ivp.h" + $File "..\common\map_shared.h" + $File "..\common\pacifier.h" + $File "..\common\polylib.h" + $File "$SRCDIR\public\tier1\tokenreader.h" + $File "..\common\utilmatlib.h" + $File "..\vmpi\vmpi.h" + $File "$SRCDIR\public\zip_uncompressed.h" + } + } + + $Folder "Public Headers" + { + $File "$SRCDIR\public\mathlib\amd3dx.h" + $File "$SRCDIR\public\arraystack.h" + $File "$SRCDIR\public\tier0\basetypes.h" + $File "$SRCDIR\public\BSPFILE.H" + $File "$SRCDIR\public\bspflags.h" + $File "$SRCDIR\public\BSPTreeData.h" + $File "$SRCDIR\public\mathlib\bumpvects.h" + $File "$SRCDIR\public\tier1\byteswap.h" + $File "$SRCDIR\public\cmodel.h" + $File "$SRCDIR\public\CollisionUtils.h" + $File "$SRCDIR\public\tier0\commonmacros.h" + $File "$SRCDIR\public\tier0\dbg.h" + $File "$SRCDIR\public\disp_common.h" + $File "$SRCDIR\public\IScratchPad3D.h" + $File "$SRCDIR\public\mathlib\mathlib.h" + $File "..\common\mstristrip.h" + $File "$SRCDIR\public\nmatrix.h" + $File "$SRCDIR\public\NTree.h" + $File "$SRCDIR\public\nvector.h" + $File "$SRCDIR\public\phyfile.h" + $File "..\common\physdll.h" + $File "..\common\qfiles.h" + $File "$SRCDIR\public\ScratchPad3D.h" + $File "..\common\scriplib.h" + $File "$SRCDIR\public\studio.h" + $File "..\common\threads.h" + $File "$SRCDIR\public\tier1\utlbuffer.h" + $File "$SRCDIR\public\tier1\utllinkedlist.h" + $File "$SRCDIR\public\tier1\utlmemory.h" + $File "$SRCDIR\public\tier1\utlrbtree.h" + $File "$SRCDIR\public\tier1\utlsymbol.h" + $File "$SRCDIR\public\tier1\utlvector.h" + $File "$SRCDIR\public\vcollide.h" + $File "$SRCDIR\public\mathlib\vector.h" + $File "$SRCDIR\public\mathlib\vector2d.h" + $File "$SRCDIR\public\mathlib\vector4d.h" + $File "$SRCDIR\public\mathlib\vmatrix.h" + $File "$SRCDIR\public\vphysics_interface.h" + $File "$SRCDIR\public\mathlib\vplane.h" + $File "$SRCDIR\public\wadtypes.h" + $File "$SRCDIR\public\worldsize.h" + } + + $Folder "Link Libraries" + { + $DynamicFile "$SRCDIR\lib\public\bitmap.lib" + $DynamicFile "$SRCDIR\lib\public\fgdlib.lib" + $DynamicFile "$SRCDIR\lib\public\mathlib.lib" + $DynamicFile "$SRCDIR\lib\public\tier2.lib" + $DynamicFile "$SRCDIR\lib\public\vtf.lib" + } + + $File "notes.txt" +} -- cgit v1.2.3