MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2024-12-26 23:05:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed v142 conflict with particles.lib (for now)

Browse Source
This commit is contained in:
Blixibon 2021-11-06 13:47:55 -05:00
parent 18b49c3778
commit b1f64f7d21
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sp/src/game/client/client_base.vpc
View File

@ -71,6 +71,7 @@ $Configuration
$SystemFrameworks "Carbon" [$OSXALL] $SystemFrameworks "Carbon" [$OSXALL]
$SystemLibraries "rt" [$LINUXALL] $SystemLibraries "rt" [$LINUXALL]
$IgnoreImportLibrary "TRUE" $IgnoreImportLibrary "TRUE"
$AdditionalOptions "$BASE /force:multiple" [$VS2019] // Required to fix _hypot in particles.lib (this may be a temporary solution)
$AdditionalDependencies "$BASE winmm.lib" [$WIN32] $AdditionalDependencies "$BASE winmm.lib" [$WIN32]
$AdditionalDependencies "$BASE wsock32.lib Ws2_32.lib" [$BUILD_REPLAY] $AdditionalDependencies "$BASE wsock32.lib Ws2_32.lib" [$BUILD_REPLAY]
} }

2
sp/src/vpc_scripts/source_dll_win32_base.vpc
View File

@ -117,7 +117,7 @@ $Project
{ {
// General // General
$CommandLine "$QUOTE$(VCInstallDir)bin\ml.exe$QUOTE /safeseh /c /Cp /Zi /Fo$QUOTE$(IntDir)\$(InputName).obj$QUOTE $QUOTE$(InputPath)$QUOTE" [!$VS2019] $CommandLine "$QUOTE$(VCInstallDir)bin\ml.exe$QUOTE /safeseh /c /Cp /Zi /Fo$QUOTE$(IntDir)\$(InputName).obj$QUOTE $QUOTE$(InputPath)$QUOTE" [!$VS2019]
$CommandLine "$QUOTE$(VC_ExecutablePath_x64_x86)bin\ml.exe$QUOTE /safeseh /c /Cp /Zi /Fo$QUOTE$(IntDir)\$(InputName).obj$QUOTE $QUOTE$(InputPath)$QUOTE" [$VS2019] $CommandLine "$QUOTE$(VC_ExecutablePath_x64_x86)\ml.exe$QUOTE /safeseh /c /Cp /Zi /Fo$QUOTE$(IntDir)\$(InputName).obj$QUOTE $QUOTE$(InputPath)$QUOTE" [$VS2019]
$Description "Compiling pointeroverride.asm" $Description "Compiling pointeroverride.asm"
$Outputs "$(IntDir)\$(InputName).obj" $Outputs "$(IntDir)\$(InputName).obj"
} }