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. --- sp/src/utils/vrad/vrad_dll-2010.vcxproj | 405 ----------------- sp/src/utils/vrad/vrad_dll-2010.vcxproj.filters | 563 ------------------------ sp/src/utils/vrad/vrad_dll.vpc | 225 ++++++++++ 3 files changed, 225 insertions(+), 968 deletions(-) delete mode 100644 sp/src/utils/vrad/vrad_dll-2010.vcxproj delete mode 100644 sp/src/utils/vrad/vrad_dll-2010.vcxproj.filters create mode 100644 sp/src/utils/vrad/vrad_dll.vpc (limited to 'sp/src/utils/vrad') diff --git a/sp/src/utils/vrad/vrad_dll-2010.vcxproj b/sp/src/utils/vrad/vrad_dll-2010.vcxproj deleted file mode 100644 index f08543fd..00000000 --- a/sp/src/utils/vrad/vrad_dll-2010.vcxproj +++ /dev/null @@ -1,405 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Vrad_dll - {90A78BD4-2532-39D9-6D34-7A3C2648508C} - - - - DynamicLibrary - MultiByte - vrad_dll - - - DynamicLibrary - MultiByte - vrad_dll - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\Debug\win32\ - .\Debug\win32\ - ..\..\devtools\vstools;$(ExecutablePath);$(Path) - true - true - true - false - true - .\Release\win32\ - .\Release\win32\ - ..\..\devtools\vstools;$(ExecutablePath);$(Path) - true - true - false - false - true - - - - - - /MP - Disabled - ..\..\common;..\..\public;..\..\public\tier0;..\..\public\tier1;..\common;..\vmpi;..\vmpi\mysql\mysqlpp\include;..\vmpi\mysql\include - _HAS_ITERATOR_DEBUGGING=0;WIN32;_WIN32;_DEBUG;DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;DLLNAME=vrad_dll;RAD_TELEMETRY_DISABLED;COMPILER_MSVC32;MPI;PROTECTED_THINGS_DISABLE;VRAD;VPCGAMECAPS=VALVE;PROJECTDIR=D:\dev\games\rel\singleplayer\src\utils\vrad;_DLL_EXT=.dll;VPCGAME=valve - true - false - Default - MultiThreadedDebug - true - StreamingSIMDExtensions - Fast - true - true - NotUsing - $(IntDir)/ - $(IntDir)/ - $(IntDir)/ - false - false - Level4 - true - EditAndContinue - CompileAsCpp - $(IntDir)/ - Prompt - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE - 1033 - - - - - /ignore:4221 - %(AdditionalDependencies);ws2_32.lib - NotSet - $(OutDir)\vrad_dll.dll - true - ..\..\lib\common;..\..\lib\public - libc;libcd;libcmt - true - $(IntDir)/$(TargetName).pdb - false - $(IntDir)/$(TargetName).map - Windows - - MachineX86 - PromptImmediately - false - false - - - true - - - true - - - true - $(OutDir)/vrad_dll.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 - - - - - - - - - /MP /d2Zi+ - MaxSpeed - AnySuitable - true - Speed - ..\..\common;..\..\public;..\..\public\tier0;..\..\public\tier1;..\common;..\vmpi;..\vmpi\mysql\mysqlpp\include;..\vmpi\mysql\include - WIN32;_WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;DLLNAME=vrad_dll;RAD_TELEMETRY_DISABLED;COMPILER_MSVC32;MPI;PROTECTED_THINGS_DISABLE;VRAD;VPCGAMECAPS=VALVE;PROJECTDIR=D:\dev\games\rel\singleplayer\src\utils\vrad;_DLL_EXT=.dll;VPCGAME=valve - true - false - MultiThreaded - false - true - StreamingSIMDExtensions - Fast - true - true - NotUsing - $(IntDir)/ - $(IntDir)/ - $(IntDir)/ - false - false - Level4 - true - ProgramDatabase - CompileAsCpp - $(IntDir)/ - Prompt - - - NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE - 1033 - - - - - /DYNAMICBASE /ignore:4221 - %(AdditionalDependencies);ws2_32.lib - NotSet - $(OutDir)\vrad_dll.dll - true - ..\..\lib\common;..\..\lib\public - libc;libcd;libcmtd - true - $(IntDir)/$(TargetName).pdb - false - $(IntDir)/$(TargetName).map - Windows - true - true - - MachineX86 - PromptImmediately - false - - - true - - - true - - - true - $(OutDir)/vrad_dll.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/sp/src/utils/vrad/vrad_dll-2010.vcxproj.filters b/sp/src/utils/vrad/vrad_dll-2010.vcxproj.filters deleted file mode 100644 index 3fbfde77..00000000 --- a/sp/src/utils/vrad/vrad_dll-2010.vcxproj.filters +++ /dev/null @@ -1,563 +0,0 @@ - - - - - {1680C80B-FF1E-EA4D-9817-CC12254F2E40} - - - {AFC34ED7-EC78-E112-6213-16C13F1BBFB5} - - - {53AF07E1-D7C4-FEE3-01A5-43636D973BE6} - - - {C5D73B3A-C648-896C-B7CE-F174808E5BA5} - - - {BA03E055-4FA2-FCE3-8A1C-D348547D379C} - - - {A7DC6913-C602-1488-0EDF-DE69D12F2421} - - - {A405CE38-5F8E-1A97-6C69-59BB1FF172C4} - - - - - Link Libraries - - - 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 - - - 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 - - - Header Files\Common Header Files - - - Header Files\Common Header Files - - - Header Files\Common Header Files - - - Header Files\Common Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Header Files\Public Header Files - - - Source Files - - - 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\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\Public Files - - - Source Files\Public Files - - - Source Files\Public Files - - - Source Files\Public Files - - - - - - - Source Files - - - - - - - - diff --git a/sp/src/utils/vrad/vrad_dll.vpc b/sp/src/utils/vrad/vrad_dll.vpc new file mode 100644 index 00000000..1b0c1c1f --- /dev/null +++ b/sp/src/utils/vrad/vrad_dll.vpc @@ -0,0 +1,225 @@ +//----------------------------------------------------------------------------- +// VRAD_DLL.VPC +// +// Project Script +//----------------------------------------------------------------------------- + +$Macro SRCDIR "..\.." +$Macro OUTBINDIR "$SRCDIR\..\game\bin" + +$Include "$SRCDIR\vpc_scripts\source_dll_win32_base.vpc" + +$Configuration +{ + $Compiler + { + $AdditionalIncludeDirectories "$BASE,..\common,..\vmpi,..\vmpi\mysql\mysqlpp\include,..\vmpi\mysql\include" + $PreprocessorDefinitions "$BASE;MPI;PROTECTED_THINGS_DISABLE;VRAD" + } + + $Linker + { + $AdditionalDependencies "$BASE ws2_32.lib" + } +} + +$Project "Vrad_dll" +{ + $Folder "Source Files" + { + $File "$SRCDIR\public\BSPTreeData.cpp" + $File "$SRCDIR\public\disp_common.cpp" + $File "$SRCDIR\public\disp_powerinfo.cpp" + $File "disp_vrad.cpp" + $File "imagepacker.cpp" + $File "incremental.cpp" + $File "leaf_ambient_lighting.cpp" + $File "lightmap.cpp" + $File "$SRCDIR\public\loadcmdline.cpp" + $File "$SRCDIR\public\lumpfiles.cpp" + $File "macro_texture.cpp" + $File "..\common\mpi_stats.cpp" + $File "mpivrad.cpp" + $File "..\common\MySqlDatabase.cpp" + $File "..\common\pacifier.cpp" + $File "..\common\physdll.cpp" + $File "radial.cpp" + $File "SampleHash.cpp" + $File "trace.cpp" + $File "..\common\utilmatlib.cpp" + $File "vismat.cpp" + $File "..\common\vmpi_tools_shared.cpp" + $File "..\common\vmpi_tools_shared.h" + $File "vrad.cpp" + $File "VRAD_DispColl.cpp" + $File "VradDetailProps.cpp" + $File "VRadDisps.cpp" + $File "vraddll.cpp" + $File "VRadStaticProps.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\DispColl_Common.cpp" + $File "..\common\map_shared.cpp" + $File "..\common\polylib.cpp" + $File "..\common\scriplib.cpp" + $File "..\common\threads.cpp" + $File "..\common\tools_minidump.cpp" + $File "..\common\tools_minidump.h" + } + + $Folder "Public Files" + { + $File "$SRCDIR\public\CollisionUtils.cpp" + $File "$SRCDIR\public\filesystem_helpers.cpp" + $File "$SRCDIR\public\ScratchPad3D.cpp" + $File "$SRCDIR\public\ScratchPadUtils.cpp" + } + } + + $Folder "Header Files" + { + $File "disp_vrad.h" + $File "iincremental.h" + $File "imagepacker.h" + $File "incremental.h" + $File "leaf_ambient_lighting.h" + $File "lightmap.h" + $File "macro_texture.h" + $File "$SRCDIR\public\map_utils.h" + $File "mpivrad.h" + $File "radial.h" + $File "$SRCDIR\public\bitmap\tgawriter.h" + $File "vismat.h" + $File "vrad.h" + $File "VRAD_DispColl.h" + $File "vraddetailprops.h" + $File "vraddll.h" + + $Folder "Common Header Files" + { + $File "..\common\bsplib.h" + $File "..\common\cmdlib.h" + $File "..\common\consolewnd.h" + $File "..\vmpi\ichannel.h" + $File "..\vmpi\imysqlwrapper.h" + $File "..\vmpi\iphelpers.h" + $File "..\common\ISQLDBReplyTarget.h" + $File "..\common\map_shared.h" + $File "..\vmpi\messbuf.h" + $File "..\common\mpi_stats.h" + $File "..\common\MySqlDatabase.h" + $File "..\common\pacifier.h" + $File "..\common\polylib.h" + $File "..\common\scriplib.h" + $File "..\vmpi\threadhelpers.h" + $File "..\common\threads.h" + $File "..\common\utilmatlib.h" + $File "..\vmpi\vmpi_defs.h" + $File "..\vmpi\vmpi_dispatch.h" + $File "..\vmpi\vmpi_distribute_work.h" + $File "..\vmpi\vmpi_filesystem.h" + } + + $Folder "Public Header Files" + { + $File "$SRCDIR\public\mathlib\amd3dx.h" + $File "$SRCDIR\public\mathlib\ANORMS.H" + $File "$SRCDIR\public\basehandle.h" + $File "$SRCDIR\public\tier0\basetypes.h" + $File "$SRCDIR\public\tier1\bitbuf.h" + $File "$SRCDIR\public\bitvec.h" + $File "$SRCDIR\public\BSPFILE.H" + $File "$SRCDIR\public\bspflags.h" + $File "$SRCDIR\public\BSPTreeData.h" + $File "$SRCDIR\public\builddisp.h" + $File "$SRCDIR\public\mathlib\bumpvects.h" + $File "$SRCDIR\public\tier1\byteswap.h" + $File "$SRCDIR\public\tier1\characterset.h" + $File "$SRCDIR\public\tier1\checksum_crc.h" + $File "$SRCDIR\public\tier1\checksum_md5.h" + $File "$SRCDIR\public\ChunkFile.h" + $File "$SRCDIR\public\cmodel.h" + $File "$SRCDIR\public\CollisionUtils.h" + $File "$SRCDIR\public\tier0\commonmacros.h" + $File "$SRCDIR\public\mathlib\compressed_vector.h" + $File "$SRCDIR\public\const.h" + $File "$SRCDIR\public\coordsize.h" + $File "$SRCDIR\public\tier0\dbg.h" + $File "$SRCDIR\public\disp_common.h" + $File "$SRCDIR\public\disp_powerinfo.h" + $File "$SRCDIR\public\disp_vertindex.h" + $File "$SRCDIR\public\DispColl_Common.h" + $File "$SRCDIR\public\tier0\fasttimer.h" + $File "$SRCDIR\public\filesystem.h" + $File "$SRCDIR\public\filesystem_helpers.h" + $File "$SRCDIR\public\GameBSPFile.h" + $File "$SRCDIR\public\gametrace.h" + $File "$SRCDIR\public\mathlib\halton.h" + $File "$SRCDIR\public\materialsystem\hardwareverts.h" + $File "$SRCDIR\public\appframework\IAppSystem.h" + $File "$SRCDIR\public\tier0\icommandline.h" + $File "$SRCDIR\public\ihandleentity.h" + $File "$SRCDIR\public\materialsystem\imaterial.h" + $File "$SRCDIR\public\materialsystem\imaterialsystem.h" + $File "$SRCDIR\public\materialsystem\imaterialvar.h" + $File "$SRCDIR\public\tier1\interface.h" + $File "$SRCDIR\public\iscratchpad3d.h" + $File "$SRCDIR\public\ivraddll.h" + $File "$SRCDIR\public\materialsystem\materialsystem_config.h" + $File "$SRCDIR\public\mathlib\mathlib.h" + $File "$SRCDIR\public\tier0\memdbgon.h" + $File "$SRCDIR\public\optimize.h" + $File "$SRCDIR\public\phyfile.h" + $File "..\common\physdll.h" + $File "$SRCDIR\public\tier0\platform.h" + $File "$SRCDIR\public\tier0\protected_things.h" + $File "$SRCDIR\public\vstdlib\random.h" + $File "$SRCDIR\public\ScratchPad3D.h" + $File "$SRCDIR\public\ScratchPadUtils.h" + $File "$SRCDIR\public\string_t.h" + $File "$SRCDIR\public\tier1\strtools.h" + $File "$SRCDIR\public\studio.h" + $File "$SRCDIR\public\tier1\tokenreader.h" + $File "$SRCDIR\public\trace.h" + $File "$SRCDIR\public\tier1\utlbuffer.h" + $File "$SRCDIR\public\tier1\utldict.h" + $File "$SRCDIR\public\tier1\utlhash.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 "..\vmpi\vmpi.h" + $File "$SRCDIR\public\vphysics_interface.h" + $File "$SRCDIR\public\mathlib\vplane.h" + $File "$SRCDIR\public\tier0\vprof.h" + $File "$SRCDIR\public\vstdlib\vstdlib.h" + $File "$SRCDIR\public\vtf\vtf.h" + $File "$SRCDIR\public\wadtypes.h" + $File "$SRCDIR\public\worldsize.h" + } + } + + $Folder "Link Libraries" + { + $DynamicFile "$SRCDIR\lib\public\bitmap.lib" + $DynamicFile "$SRCDIR\lib\public\mathlib.lib" + $DynamicFile "$SRCDIR\lib\public\raytrace.lib" + $DynamicFile "$SRCDIR\lib\public\tier2.lib" + $DynamicFile "$SRCDIR\lib\public\vmpi.lib" + $DynamicFile "$SRCDIR\lib\public\vtf.lib" + } + + $File "notes.txt" +} -- cgit v1.2.3