mirror of
https://github.com/alliedmodders/hl2sdk.git
synced 2025-09-19 03:56:10 +08:00
* Added support for building shaders in your mod
* Added nav mesh support * fixed many warnings and misc bugs * Fixed the create*projects scripts in mp * Added a bunch of stuff to .gitignore
This commit is contained in:
@ -23,10 +23,16 @@ $Group "game"
|
||||
"vgui_controls"
|
||||
}
|
||||
|
||||
$Group "shaders"
|
||||
{
|
||||
"game_shader_dx9"
|
||||
}
|
||||
|
||||
$Group "everything"
|
||||
{
|
||||
"captioncompiler"
|
||||
"client"
|
||||
"game_shader_dx9"
|
||||
"glview"
|
||||
"height2normal"
|
||||
"mathlib"
|
||||
|
@ -19,6 +19,11 @@ $Project "client"
|
||||
"game\client\client_hl2mp.vpc" [($WIN32||$POSIX) && $HL2MP]
|
||||
}
|
||||
|
||||
$Project "game_shader_dx9"
|
||||
{
|
||||
"materialsystem\stdshaders\game_shader_dx9_hl2mp.vpc" [$HL2MP]
|
||||
}
|
||||
|
||||
$Project "glview"
|
||||
{
|
||||
"utils\glview\glview.vpc" [$WIN32]
|
||||
|
@ -10,8 +10,8 @@
|
||||
// This is one file we expect to be different between branches and so it must be merged carefully
|
||||
|
||||
// Staging branch:
|
||||
//$Macro STAGING_ONLY "1"
|
||||
//$Conditional STAGING_ONLY "1"
|
||||
|
||||
// rel/tf_beta branch:
|
||||
//$Macro TF_BETA "1"
|
||||
//$Conditional TF_BETA "1"
|
||||
|
||||
|
@ -130,7 +130,7 @@ $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"
|
||||
$Description "Compiling pointeroverride.asm"
|
||||
$Outputs "$(IntDir)\$(InputName).obj"
|
||||
}
|
||||
|
@ -31,7 +31,7 @@
|
||||
|
||||
$Macro GL "1" [!$DEDICATED && !$WIN32 && !$WIN64]
|
||||
// If we're using OpenGL, we're implicitly using SDL.
|
||||
$Macro SDL "1" [$GL && !$OSXALL && !$DEDICATED]
|
||||
$Macro SDL "1" [$GL && !$DEDICATED]
|
||||
|
||||
$Configuration
|
||||
{
|
||||
@ -57,5 +57,14 @@ $Configuration
|
||||
$PreprocessorDefinitions "$BASE;USE_SDL" [$SDL]
|
||||
$AdditionalIncludeDirectories "$BASE;$SRCDIR\thirdparty\SDL2" [$SDL || $DEDICATED]
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
$Project
|
||||
{
|
||||
$Folder "Link Libraries" [$OSXALL && $SDL]
|
||||
{
|
||||
$DynamicFile "$SRCDIR\lib\public\$PLATFORM\$_IMPLIB_PREFIXSDL2$_IMPLIB_EXT"
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -60,10 +60,6 @@ $Configuration
|
||||
$PreprocessorDefinitions "$BASE;WIN64;_WIN64;COMPILER_MSVC64" [$WIN64]
|
||||
$PreprocessorDefinitions "$BASE;COMPILER_MSVC32" [$WIN32]
|
||||
|
||||
// The VS 2012 compiler keeps hitting internal compiler errors during /analyze. In order to get these
|
||||
// fixed we need to report them.
|
||||
$AdditionalOptions "$BASE /errorReport:send" [$ANALYZE]
|
||||
|
||||
// Pass on appropriate branch define to preprocessor
|
||||
$PreprocessorDefinitions "$BASE;STAGING_ONLY" [$STAGING_ONLY]
|
||||
$PreprocessorDefinitions "$BASE;TF_BETA" [$TF_BETA]
|
||||
|
Reference in New Issue
Block a user