celisej567/source-engine
1
0
Fork 0
mirror of https://github.com/celisej567/source-engine.git synced 2025-12-31 21:48:22 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix compilation under MSVC(VS2019)

Browse Source
This commit is contained in:
JusicP
2022-01-13 16:18:38 +02:00
parent 94fb7d4c00
commit 5e27785d40
127 changed files with 195 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
vpc_scripts/fbx.vpc Normal file
View File

@@ -0,0 +1,38 @@
//============ Copyright (c) Valve Corporation, All rights reserved. ==========
//
// In addition to fbx_base.vpc which defines the version, include path and
// defines for compiling code that utilizes Autodesk FBX SDK, add the lib
// for linking.
//
//=============================================================================
$MacroRequired SRCDIR
$Include "$SRCDIR\vpc_scripts\fbx_base.vpc"
$Macro VSDIR "vs2010" [$VS2010]
$Macro VSDIR "vs2012" [$VS2012]
$Macro VSDIR "vs2012" [$VS2013] // !!NOTE!! INTENTIONALLY use the 2012 version to avoid a bug caused by the VS2013 compiler.
$Macro VSDIR "vs2012" [$VS2015] // !!NOTE!! INTENTIONALLY use the 2012 version to avoid a bug caused by the VS2013 compiler.
// Use the shared version of FBX lib to allow mixing DEBUG & RELEASE builds
$Macro FBXLIB_RELEASE "$FBXDIR\lib\$VSDIR\x86\release\libfbxsdk.lib" [$WIN32]
$Macro FBXLIB_RELEASE "$FBXDIR\lib\$VSDIR\x64\release\libfbxsdk.lib" [$WIN64]
$Macro FBXLIB_DEBUG "$FBXDIR\lib\$VSDIR\x86\release\libfbxsdk.lib" [$WIN32]
$Macro FBXLIB_DEBUG "$FBXDIR\lib\$VSDIR\x64\release\libfbxsdk.lib" [$WIN64]
$Configuration "Release"
{
$Linker
{
$AdditionalDependencies "$BASE wininet.lib $FBXLIB_RELEASE" [$WIN32 || $WIN64]
}
}
$Configuration "Debug"
{
$Linker
{
$AdditionalDependencies "$BASE wininet.lib $FBXLIB_DEBUG" [$WIN32 || $WIN64]
}
}

22
vpc_scripts/fbx_base.vpc Normal file
View File

@@ -0,0 +1,22 @@
//============ Copyright (c) Valve Corporation, All rights reserved. ==========
//
// FBX Version, include path and defines for compiling code that utilizes
// Autodesk FBX SDK
//
//=============================================================================
$MacroRequired SRCDIR
$Macro FBXVER "2015.1"
$Macro FBXDIR "$SRCDIR\thirdparty\fbx\FbxSdk\$FBXVER"
$Configuration
{
$Compiler
{
$AdditionalIncludeDirectories "$BASE;$FBXDIR\include"
$PreprocessorDefinitions "$BASE;FBXSDK_NEW_API"
$PreprocessorDefinitions "$BASE;FBXSDK_SHARED" [$VS2012 || $VS2013 || $VS2015]
}
}

24
vpc_scripts/groups.vgc
View File

@@ -125,9 +125,10 @@ $Group "console"
$Group "game"
{
"vaudio_minimp3"
"appframework"
"bitmap"
"bsppack"
// "bsppack"
"bzip2"
"choreoobjects"
"client"
@@ -135,16 +136,16 @@ $Group "game"
"datamodel"
"dedicated"
"dedicated_main"
"dmserializers"
// "dmserializers"
"dmxloader"
"engine"
"fbxutils"
// "fbxutils"
"filesystem_stdio"
"gameui"
// "gc"
"gcsdk"
// "gcsdk"
// "gcsdk_gc"
"haptics"
// "haptics"
"havana_constraints"
"hk_base"
"hk_math"
@@ -158,17 +159,18 @@ $Group "game"
"materialsystem"
"mathlib"
"matsys_controls"
"movieobjects"
// "movieobjects"
"particles"
"raytrace"
// "raytrace"
"replay"
"replay_common"
"scenefilecache"
"server"
"serverbrowser"
"shaderapidx9"
"shaderlib"
"simdtest"
"socketlib"
// "simdtest"
// "socketlib"
"soundemittersystem"
"sourcevr"
"stdshader_dbg"
@@ -187,11 +189,13 @@ $Group "game"
"vgui_surfacelib"
"vguimatsurface"
"vphysics"
"video_services"
"vpklib"
"vstdlib"
"vtf"
"coroutine_osx"
"zlib"
"unicode"
// "zlib"
}
$Group "everything"

7
vpc_scripts/source_dll_win32_base.vpc
View File

@@ -66,11 +66,11 @@ $Configuration
$PostBuildEvent [!$ANALYZE]
{
$CommandLine "if not exist $QUOTE$OUTBINDIR$QUOTE mkdir $QUOTE$OUTBINDIR$QUOTE" "\n"
$CommandLine "$BASE" "call $SRCDIR\vpc_scripts\valve_p4_edit.cmd $QUOTE$OUTBINDIR\$(TargetFileName)$QUOTE $SRCDIR" "\n" [!$SOURCESDK]
// $CommandLine "$BASE" "call $SRCDIR\vpc_scripts\valve_p4_edit.cmd $QUOTE$OUTBINDIR\$(TargetFileName)$QUOTE $SRCDIR" "\n" [!$SOURCESDK]
$CommandLine "$BASE" "copy $QUOTE$(TargetDir)$(TargetFileName)$QUOTE $QUOTE$OUTBINDIR\$(TargetFileName)$QUOTE" "\n" \
"if ERRORLEVEL 1 goto BuildEventFailed" "\n" \
"if exist $QUOTE$(TargetDir)$(TargetName).map$QUOTE copy $QUOTE$(TargetDir)$(TargetName).map$QUOTE $OUTBINDIR\$(TargetName).map" "\n"
$CommandLine "$BASE" "call $SRCDIR\vpc_scripts\valve_p4_edit.cmd $QUOTE$OUTBINDIR\$(TargetName).pdb$QUOTE $SRCDIR" "\n" [!$SOURCESDK]
// $CommandLine "$BASE" "call $SRCDIR\vpc_scripts\valve_p4_edit.cmd $QUOTE$OUTBINDIR\$(TargetName).pdb$QUOTE $SRCDIR" "\n" [!$SOURCESDK]
$CommandLine "$BASE" "copy $QUOTE$(TargetDir)$(TargetName).pdb$QUOTE $OUTBINDIR\$(TargetName).pdb" "\n" \
"if ERRORLEVEL 1 goto BuildEventFailed" "\n" \
"goto BuildEventOK" "\n" \
@@ -110,7 +110,8 @@ $Project
$CustomBuildStep
{
// General
$CommandLine "$QUOTE$(VCInstallDir)bin\ml.exe$QUOTE /safeseh /c /Cp /Zi /Fo$QUOTE$(IntDir)\$(InputName).obj$QUOTE $QUOTE$(InputPath)$QUOTE"
$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_x86_x86)\ml.exe$QUOTE /safeseh /c /Cp /Zi /Fo$QUOTE$(IntDir)\$(InputName).obj$QUOTE $QUOTE$(InputPath)$QUOTE" [$VS2019]
$Description "Compiling pointeroverride.asm"
$Outputs "$(IntDir)\$(InputName).obj"
}

7
vpc_scripts/source_exe_win_win32_base.vpc
View File

@@ -68,11 +68,11 @@ $Configuration
$PostBuildEvent [!$ANALYZE]
{
$CommandLine "call $SRCDIR\vpc_scripts\valve_p4_edit.cmd $OUTBINDIR\$(TargetFileName) $SRCDIR" "\n" [!$SOURCESDK]
// $CommandLine "call $SRCDIR\vpc_scripts\valve_p4_edit.cmd $OUTBINDIR\$(TargetFileName) $SRCDIR" "\n" [!$SOURCESDK]
$CommandLine "$BASE" "copy $QUOTE$(TargetDir)$QUOTE$(TargetFileName) $OUTBINDIR\$(TargetFileName) >nul" "\n" \
"if ERRORLEVEL 1 goto BuildEventFailed" "\n" \
"if exist $QUOTE$(TargetDir)$QUOTE$(TargetName).map copy $QUOTE$(TargetDir)$QUOTE$(TargetName).map $OUTBINDIR\$(TargetName).map >nul" "\n"
$CommandLine "$BASE" "call $SRCDIR\vpc_scripts\valve_p4_edit.cmd $OUTBINDIR\$(TargetName).pdb $SRCDIR" "\n" [!$SOURCESDK]
// $CommandLine "$BASE" "call $SRCDIR\vpc_scripts\valve_p4_edit.cmd $OUTBINDIR\$(TargetName).pdb $SRCDIR" "\n" [!$SOURCESDK]
$CommandLine "$BASE" "copy $QUOTE$(TargetDir)$QUOTE$(TargetName).pdb $OUTBINDIR\$(TargetName).pdb >nul" "\n" \
"if ERRORLEVEL 1 goto BuildEventFailed" "\n" \
"goto BuildEventOK" "\n" \
@@ -111,7 +111,8 @@ $Project
$CustomBuildStep
{
// General
$CommandLine "$QUOTE$(VCInstallDir)bin\ml.exe$QUOTE /c /Cp /Zi /Fo$QUOTE$(IntDir)\$(InputName).obj$QUOTE $QUOTE$(InputPath)$QUOTE"
$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_x86_x86)\ml.exe$QUOTE /safeseh /c /Cp /Zi /Fo$QUOTE$(IntDir)\$(InputName).obj$QUOTE $QUOTE$(InputPath)$QUOTE" [$VS2019]
$Description "Compiling pointeroverride.asm"
$Outputs "$(IntDir)\$(InputName).obj"
}

2
vpc_scripts/source_lib_win32_base.vpc
View File

@@ -58,7 +58,7 @@ $Configuration
$PreLinkEvent [!$ANALYZE && !$SOURCESDK]
{
$CommandLine "call $SRCDIR\vpc_scripts\valve_p4_edit.cmd $OUTLIBDIR\$(TargetName).lib $SRCDIR"
// $CommandLine "call $SRCDIR\vpc_scripts\valve_p4_edit.cmd $OUTLIBDIR\$(TargetName).lib $SRCDIR"
}
$Librarian

2
vpc_scripts/source_video_base.vpc
View File

@@ -45,6 +45,6 @@ $Configuration
$PreprocessorDefinitions "$BASE;GL_GLEXT_PROTOTYPES;DX_TO_GL_ABSTRACTION" [$GL]
$PreprocessorDefinitions "$BASE;USE_SDL" [$SDL]
$AdditionalIncludeDirectories "$BASE;$SRCDIR\thirdparty\SDL2" [$SDL || $DEDICATED]
$AdditionalIncludeDirectories "$BASE;$SRCDIR\thirdparty\SDL" [$SDL || $DEDICATED]
}
}

3
vpc_scripts/source_win32_base.vpc
View File

@@ -18,6 +18,7 @@ $Configuration
$PlatformToolset "v120" [$VS2013 && $ANALYZE] // VS 2013 for /analyze
$PlatformToolset "v140_xp" [$VS2015 && !$ANALYZE] // VS 2015 for /analyze
$PlatformToolset "v140" [$VS2015 && $ANALYZE] // VS 2015 for /analyze
$PlatformToolset "v142" [$VS2019] // VS 2019
}
$General
@@ -48,7 +49,7 @@ $Configuration
// window since F8 stops on both warnings and errors. The only way to
// keep the warning count down is to have warnings-as-errors.
// We will not be warning free on 64-bit for a while...
$TreatWarningsAsErrors "Yes (/WX)" [!$ANALYZE && !$WIN64]
//$TreatWarningsAsErrors "Yes (/WX)" [!$ANALYZE && !$WIN64]
// Defines to differentiate 32 from 64 bit builds
$PreprocessorDefinitions "$BASE;PLATFORM_64BITS;WIN64;_WIN64;COMPILER_MSVC64" [$WIN64]