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. --- .../utils/motionmapper/motionmapper-2010.vcxproj | 288 --------------------- .../motionmapper/motionmapper-2010.vcxproj.filters | 188 -------------- mp/src/utils/motionmapper/motionmapper.vpc | 88 +++++++ 3 files changed, 88 insertions(+), 476 deletions(-) delete mode 100644 mp/src/utils/motionmapper/motionmapper-2010.vcxproj delete mode 100644 mp/src/utils/motionmapper/motionmapper-2010.vcxproj.filters create mode 100644 mp/src/utils/motionmapper/motionmapper.vpc (limited to 'mp/src/utils/motionmapper') diff --git a/mp/src/utils/motionmapper/motionmapper-2010.vcxproj b/mp/src/utils/motionmapper/motionmapper-2010.vcxproj deleted file mode 100644 index ba84e933..00000000 --- a/mp/src/utils/motionmapper/motionmapper-2010.vcxproj +++ /dev/null @@ -1,288 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - Motionmapper - {C805838C-256D-6672-3417-589B6AF7D95E} - - - - Application - MultiByte - motionmapper - - - Application - MultiByte - motionmapper - - - - - - - - - - - - - <_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 motionmapper.vcxproj if ERRORLEVEL 1 exit 1 - - - /MP - Disabled - ..\..\common;..\..\public;..\..\public\tier0;..\..\public\tier1;..\common;..\nvtristriplib;..\..\Game_Shared - _HAS_ITERATOR_DEBUGGING=0;WIN32;_WIN32;_DEBUG;DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;RAD_TELEMETRY_DISABLED;COMPILER_MSVC32;PROTECTED_THINGS_DISABLE;VPCGAMECAPS=VALVE;PROJECTDIR=D:\dev\games\rel\hl2\src\utils\motionmapper;_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);winmm.lib - NotSet - $(OutDir)\motionmapper.exe - true - libc;libcd;libcmt - true - $(IntDir)/$(TargetName).pdb - false - $(IntDir)/$(TargetName).map - Console - - MachineX86 - PromptImmediately - false - - - true - - - true - - - true - $(OutDir)/motionmapper.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 motionmapper.vcxproj if ERRORLEVEL 1 exit 1 - - - /MP /d2Zi+ - MaxSpeed - AnySuitable - true - Speed - ..\..\common;..\..\public;..\..\public\tier0;..\..\public\tier1;..\common;..\nvtristriplib;..\..\Game_Shared - WIN32;_WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;RAD_TELEMETRY_DISABLED;COMPILER_MSVC32;PROTECTED_THINGS_DISABLE;VPCGAMECAPS=VALVE;PROJECTDIR=D:\dev\games\rel\hl2\src\utils\motionmapper;_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);winmm.lib - NotSet - $(OutDir)\motionmapper.exe - true - libc;libcd;libcmtd - true - $(IntDir)/$(TargetName).pdb - false - $(IntDir)/$(TargetName).map - Console - true - true - - MachineX86 - PromptImmediately - - - true - - - true - - - true - $(OutDir)/motionmapper.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/motionmapper/motionmapper-2010.vcxproj.filters b/mp/src/utils/motionmapper/motionmapper-2010.vcxproj.filters deleted file mode 100644 index 15d71252..00000000 --- a/mp/src/utils/motionmapper/motionmapper-2010.vcxproj.filters +++ /dev/null @@ -1,188 +0,0 @@ - - - - - {1680C80B-FF1E-EA4D-9817-CC12254F2E40} - - - {C5D73B3A-C648-896C-B7CE-F174808E5BA5} - - - {BA03E055-4FA2-FCE3-8A1C-D348547D379C} - - - - - 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 - - - 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 - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - - - Source Files - - - - - diff --git a/mp/src/utils/motionmapper/motionmapper.vpc b/mp/src/utils/motionmapper/motionmapper.vpc new file mode 100644 index 00000000..0a59a92d --- /dev/null +++ b/mp/src/utils/motionmapper/motionmapper.vpc @@ -0,0 +1,88 @@ +//----------------------------------------------------------------------------- +// MOTIONMAPPER.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,..\nvtristriplib,$SRCDIR\Game_Shared" + $PreprocessorDefinitions "$BASE;PROTECTED_THINGS_DISABLE" + } + + $Linker + { + $AdditionalDependencies "$BASE winmm.lib" + } +} + +$Project "Motionmapper" +{ + $Folder "Source Files" + { + $File "..\common\cmdlib.cpp" + $File "$SRCDIR\public\filesystem_helpers.cpp" + $File "$SRCDIR\public\filesystem_init.cpp" + $File "..\common\filesystem_tools.cpp" + $File "motionmapper.cpp" + $File "..\common\scriplib.cpp" + } + + $Folder "Header Files" + { + $File "$SRCDIR\public\mathlib\amd3dx.h" + $File "$SRCDIR\public\tier0\basetypes.h" + $File "$SRCDIR\public\tier1\characterset.h" + $File "..\common\cmdlib.h" + $File "$SRCDIR\public\Color.h" + $File "$SRCDIR\public\tier0\commonmacros.h" + $File "$SRCDIR\public\mathlib\compressed_vector.h" + $File "$SRCDIR\public\tier0\dbg.h" + $File "$SRCDIR\public\tier0\fasttimer.h" + $File "$SRCDIR\public\filesystem.h" + $File "$SRCDIR\public\filesystem_helpers.h" + $File "..\common\filesystem_tools.h" + $File "$SRCDIR\public\appframework\IAppSystem.h" + $File "$SRCDIR\public\tier0\icommandline.h" + $File "$SRCDIR\public\vstdlib\IKeyValuesSystem.h" + $File "$SRCDIR\public\tier1\interface.h" + $File "$SRCDIR\public\tier1\KeyValues.h" + $File "$SRCDIR\public\mathlib\mathlib.h" + $File "$SRCDIR\public\tier0\mem.h" + $File "$SRCDIR\public\tier0\memalloc.h" + $File "$SRCDIR\public\tier0\memdbgoff.h" + $File "$SRCDIR\public\tier0\memdbgon.h" + $File "motionmapper.h" + $File "$SRCDIR\public\tier0\platform.h" + $File "$SRCDIR\public\tier0\protected_things.h" + $File "..\common\scriplib.h" + $File "$SRCDIR\public\string_t.h" + $File "$SRCDIR\public\tier1\strtools.h" + $File "$SRCDIR\public\studio.h" + $File "$SRCDIR\public\tier1\utlbuffer.h" + $File "$SRCDIR\public\tier1\utldict.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\mathlib\vector.h" + $File "$SRCDIR\public\mathlib\vector2d.h" + $File "$SRCDIR\public\mathlib\vector4d.h" + $File "$SRCDIR\public\vstdlib\vstdlib.h" + } + + $Folder "Link Libraries" + { + $DynamicFile "$SRCDIR\lib\public\mathlib.lib" + $DynamicFile "$SRCDIR\lib\public\nvtristrip.lib" + $DynamicFile "$SRCDIR\lib\public\tier2.lib" + } +} -- cgit v1.2.3