diff --git a/.gitignore b/.gitignore index 0344d74957..9edacd8fa9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ *.mak *.mak.vpc_crc *.vpc_crc +*.vpc.* *.project *obj_* build/ @@ -8,3 +9,24 @@ build/ .lock-waf* __pycache__ *.pyc +.vs/ +Debug/ +Debug_*/ +Release/ +Release_*/ +*.tlog/ +*.obj +*.pch +*.log +*.idb +*.pdb +*.rc +*.bin +*.vcxproj* +*.sln +*.dll* +*.exp +*.ilk +ValveETWProviderEvents.h +game/client/*/client.lib +game/server/*/server.lib \ No newline at end of file diff --git a/bitmap/bitmap.vpc b/bitmap/bitmap.vpc index 9471c15e5f..2faadbda2b 100644 --- a/bitmap/bitmap.vpc +++ b/bitmap/bitmap.vpc @@ -15,6 +15,8 @@ $Configuration $AdditionalIncludeDirectories "$BASE;$SRCDIR\dx9sdk\include" [$WINDOWS] $AdditionalIncludeDirectories "$BASE;$SRCDIR\x360xdk\include\win32\vs2005" [$WINDOWS] $AdditionalIncludeDirectories "$BASE;$SRCDIR\thirdparty\stb" + + $PreprocessorDefinitions "$BASE;NO_X360_XDK;" [!$X360] } } diff --git a/creategameprojects.bat b/creategameprojects.bat new file mode 100644 index 0000000000..80f41fef71 --- /dev/null +++ b/creategameprojects.bat @@ -0,0 +1 @@ +devtools\bin\vpc.exe /2019 +game /hl2 /mksln game.sln diff --git a/datacache/datacache.vpc b/datacache/datacache.vpc index e8805b46fa..27a64f56a1 100644 --- a/datacache/datacache.vpc +++ b/datacache/datacache.vpc @@ -5,7 +5,7 @@ //----------------------------------------------------------------------------- $macro SRCDIR ".." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" $include "$SRCDIR\vpc_scripts\source_dll_base.vpc" diff --git a/dedicated/dedicated.vpc b/dedicated/dedicated.vpc index fccc53a785..0f5a47beef 100644 --- a/dedicated/dedicated.vpc +++ b/dedicated/dedicated.vpc @@ -5,7 +5,7 @@ //----------------------------------------------------------------------------- $Macro SRCDIR ".." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" $Include "$SRCDIR\vpc_scripts\source_dll_base.vpc" $include "$SRCDIR\vpc_scripts\source_cryptlib_include.vpc" @@ -142,6 +142,7 @@ $Project "Dedicated" $Lib tier2 $Lib tier3 $Lib vgui_controls [$WIN32] + $Lib vpklib $LibExternal "$SRCDIR/thirdparty/libedit-3.1/src/.libs/libedit" [$LINUXALL] $ImpLibExternal steam_api $ImpLib SDL2 [$SDL] diff --git a/devtools/bin/vpc.exe b/devtools/bin/vpc.exe index e611043031..51f7a24744 100755 Binary files a/devtools/bin/vpc.exe and b/devtools/bin/vpc.exe differ diff --git a/dx9sdk/lib/DxErr8.lib b/dx9sdk/lib/DxErr8.lib index 8789a288b3..c22ccde6c0 100644 Binary files a/dx9sdk/lib/DxErr8.lib and b/dx9sdk/lib/DxErr8.lib differ diff --git a/dx9sdk/lib/DxErr9.lib b/dx9sdk/lib/DxErr9.lib index c3ebc387ac..3f039fa2a9 100644 Binary files a/dx9sdk/lib/DxErr9.lib and b/dx9sdk/lib/DxErr9.lib differ diff --git a/dx9sdk/lib/XInput.lib b/dx9sdk/lib/XInput.lib index d07060d910..21b8358ac3 100644 Binary files a/dx9sdk/lib/XInput.lib and b/dx9sdk/lib/XInput.lib differ diff --git a/dx9sdk/lib/amstrmid.lib b/dx9sdk/lib/amstrmid.lib index 1ab9928f66..8d92123962 100644 Binary files a/dx9sdk/lib/amstrmid.lib and b/dx9sdk/lib/amstrmid.lib differ diff --git a/dx9sdk/lib/d3d8.lib b/dx9sdk/lib/d3d8.lib index 7d118c637e..828ed30d39 100644 Binary files a/dx9sdk/lib/d3d8.lib and b/dx9sdk/lib/d3d8.lib differ diff --git a/dx9sdk/lib/d3d9.lib b/dx9sdk/lib/d3d9.lib index 6f0645baa3..9e08d8637c 100644 Binary files a/dx9sdk/lib/d3d9.lib and b/dx9sdk/lib/d3d9.lib differ diff --git a/dx9sdk/lib/d3dx.lib b/dx9sdk/lib/d3dx.lib index 3f3742d491..e9450b1bc8 100644 Binary files a/dx9sdk/lib/d3dx.lib and b/dx9sdk/lib/d3dx.lib differ diff --git a/dx9sdk/lib/d3dx8.lib b/dx9sdk/lib/d3dx8.lib index 82a6c72c17..8305ff4c21 100644 Binary files a/dx9sdk/lib/d3dx8.lib and b/dx9sdk/lib/d3dx8.lib differ diff --git a/dx9sdk/lib/d3dx8d.lib b/dx9sdk/lib/d3dx8d.lib index 3d42772a69..8be3558778 100644 Binary files a/dx9sdk/lib/d3dx8d.lib and b/dx9sdk/lib/d3dx8d.lib differ diff --git a/dx9sdk/lib/d3dx8dt.lib b/dx9sdk/lib/d3dx8dt.lib index 185d2d720e..040d8ca3c0 100644 Binary files a/dx9sdk/lib/d3dx8dt.lib and b/dx9sdk/lib/d3dx8dt.lib differ diff --git a/dx9sdk/lib/d3dx9.lib b/dx9sdk/lib/d3dx9.lib index 7d60606ecb..11853bf0ac 100644 Binary files a/dx9sdk/lib/d3dx9.lib and b/dx9sdk/lib/d3dx9.lib differ diff --git a/dx9sdk/lib/d3dx9d.lib b/dx9sdk/lib/d3dx9d.lib index f85fd2fc88..e7e722ee80 100644 Binary files a/dx9sdk/lib/d3dx9d.lib and b/dx9sdk/lib/d3dx9d.lib differ diff --git a/dx9sdk/lib/d3dx9dt.lib b/dx9sdk/lib/d3dx9dt.lib index f3d69be97f..2802acb29d 100644 Binary files a/dx9sdk/lib/d3dx9dt.lib and b/dx9sdk/lib/d3dx9dt.lib differ diff --git a/dx9sdk/lib/d3dxd.lib b/dx9sdk/lib/d3dxd.lib index 9d856463a6..dbd9a1c0f5 100644 Binary files a/dx9sdk/lib/d3dxd.lib and b/dx9sdk/lib/d3dxd.lib differ diff --git a/dx9sdk/lib/d3dxof.lib b/dx9sdk/lib/d3dxof.lib index fd9dbe2d6b..c7e5178117 100644 Binary files a/dx9sdk/lib/d3dxof.lib and b/dx9sdk/lib/d3dxof.lib differ diff --git a/dx9sdk/lib/ddraw.lib b/dx9sdk/lib/ddraw.lib index 4d1c70bfb7..d7d0583e93 100644 Binary files a/dx9sdk/lib/ddraw.lib and b/dx9sdk/lib/ddraw.lib differ diff --git a/dx9sdk/lib/dinput.lib b/dx9sdk/lib/dinput.lib index a075a4fca5..3abb454000 100644 Binary files a/dx9sdk/lib/dinput.lib and b/dx9sdk/lib/dinput.lib differ diff --git a/dx9sdk/lib/dinput8.lib b/dx9sdk/lib/dinput8.lib index 6e301ed836..c870a09c11 100644 Binary files a/dx9sdk/lib/dinput8.lib and b/dx9sdk/lib/dinput8.lib differ diff --git a/dx9sdk/lib/dmoguids.lib b/dx9sdk/lib/dmoguids.lib index 1c325cfc98..ad5fbfb25e 100644 Binary files a/dx9sdk/lib/dmoguids.lib and b/dx9sdk/lib/dmoguids.lib differ diff --git a/dx9sdk/lib/dplayx.lib b/dx9sdk/lib/dplayx.lib index b09dd3e7ca..d8e429985f 100644 Binary files a/dx9sdk/lib/dplayx.lib and b/dx9sdk/lib/dplayx.lib differ diff --git a/dx9sdk/lib/dsetup.lib b/dx9sdk/lib/dsetup.lib index f8ccbbf95b..8acfa3ea37 100644 Binary files a/dx9sdk/lib/dsetup.lib and b/dx9sdk/lib/dsetup.lib differ diff --git a/dx9sdk/lib/dsound.lib b/dx9sdk/lib/dsound.lib index f7817aa8b1..c07fe8582f 100644 Binary files a/dx9sdk/lib/dsound.lib and b/dx9sdk/lib/dsound.lib differ diff --git a/dx9sdk/lib/dxguid.lib b/dx9sdk/lib/dxguid.lib index b4b6103326..82835ab226 100644 Binary files a/dx9sdk/lib/dxguid.lib and b/dx9sdk/lib/dxguid.lib differ diff --git a/dx9sdk/lib/dxtrans.lib b/dx9sdk/lib/dxtrans.lib index 2d6e927dce..20a499523b 100644 Binary files a/dx9sdk/lib/dxtrans.lib and b/dx9sdk/lib/dxtrans.lib differ diff --git a/dx9sdk/lib/encapi.lib b/dx9sdk/lib/encapi.lib index 0f00b15bc4..0e3d774d10 100644 Binary files a/dx9sdk/lib/encapi.lib and b/dx9sdk/lib/encapi.lib differ diff --git a/dx9sdk/lib/ksproxy.lib b/dx9sdk/lib/ksproxy.lib index 9ef13a5d97..4f3624606b 100644 Binary files a/dx9sdk/lib/ksproxy.lib and b/dx9sdk/lib/ksproxy.lib differ diff --git a/dx9sdk/lib/ksuser.lib b/dx9sdk/lib/ksuser.lib index 3758c5c7d4..7aba7bd709 100644 Binary files a/dx9sdk/lib/ksuser.lib and b/dx9sdk/lib/ksuser.lib differ diff --git a/dx9sdk/lib/msdmo.lib b/dx9sdk/lib/msdmo.lib index dae78e2dbc..290e308f94 100644 Binary files a/dx9sdk/lib/msdmo.lib and b/dx9sdk/lib/msdmo.lib differ diff --git a/dx9sdk/lib/quartz.lib b/dx9sdk/lib/quartz.lib index f6648444e4..47fcd1d2dc 100644 Binary files a/dx9sdk/lib/quartz.lib and b/dx9sdk/lib/quartz.lib differ diff --git a/dx9sdk/lib/strmiids.lib b/dx9sdk/lib/strmiids.lib index 1ab9928f66..8d92123962 100644 Binary files a/dx9sdk/lib/strmiids.lib and b/dx9sdk/lib/strmiids.lib differ diff --git a/engine/audio/private/snd_dev_direct.cpp b/engine/audio/private/snd_dev_direct.cpp index 91499644da..fad4752d16 100644 --- a/engine/audio/private/snd_dev_direct.cpp +++ b/engine/audio/private/snd_dev_direct.cpp @@ -46,6 +46,8 @@ typedef enum {SIS_SUCCESS, SIS_FAILURE, SIS_NOTAVAIL} sndinitstat; // hack - need to include latest dsound.h #undef DSSPEAKER_5POINT1 #undef DSSPEAKER_7POINT1 +#undef DSSPEAKER_7POINT1_SURROUND +#undef DSSPEAKER_5POINT1_SURROUND #define DSSPEAKER_5POINT1 6 #define DSSPEAKER_7POINT1 7 #define DSSPEAKER_7POINT1_SURROUND 8 diff --git a/engine/engine.vpc b/engine/engine.vpc index 7d6eb1433d..83471eea01 100644 --- a/engine/engine.vpc +++ b/engine/engine.vpc @@ -5,7 +5,7 @@ //----------------------------------------------------------------------------- $macro SRCDIR ".." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" $include "$SRCDIR\vpc_scripts\source_dll_base.vpc" $include "$SRCDIR\vpc_scripts\source_replay.vpc" diff --git a/engine/voice_codecs/minimp3/vaudio_minimp3.vpc b/engine/voice_codecs/minimp3/vaudio_minimp3.vpc index c7f4f42ce7..a153b96894 100644 --- a/engine/voice_codecs/minimp3/vaudio_minimp3.vpc +++ b/engine/voice_codecs/minimp3/vaudio_minimp3.vpc @@ -6,17 +6,17 @@ $Macro SRCDIR "..\..\.." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" $Include "$SRCDIR\vpc_scripts\source_dll_base.vpc" $Configuration { - $Compiler - { - $AdditionalIncludeDirectories "$BASE,$SRCDIR\thirdparty\minimp3\,..\..\..\public,..\..\..\public\tier1,..\..,..\..\..\common,..\..\audio\public" - $PreprocessorDefinitions "$BASE;" - } + $Compiler + { + $AdditionalIncludeDirectories "$BASE,$SRCDIR\thirdparty\minimp3\,..\..\..\public,..\..\..\public\tier1,..\..,..\..\..\common,..\..\audio\public" + $DisableSpecificWarnings "$BASE;4706" + } } $Project "vaudio_minimp3" diff --git a/filesystem/filesystem_stdio.vpc b/filesystem/filesystem_stdio.vpc index e490aabc92..66ee569e20 100644 --- a/filesystem/filesystem_stdio.vpc +++ b/filesystem/filesystem_stdio.vpc @@ -5,7 +5,7 @@ //----------------------------------------------------------------------------- $macro SRCDIR ".." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" $include "$SRCDIR\vpc_scripts\source_dll_base.vpc" $include "$SRCDIR\vpc_scripts\source_cryptlib_include.vpc" diff --git a/filesystem/filesystem_steam.vpc b/filesystem/filesystem_steam.vpc index cc840f1c8d..7f1ecf3f50 100644 --- a/filesystem/filesystem_steam.vpc +++ b/filesystem/filesystem_steam.vpc @@ -5,7 +5,7 @@ //----------------------------------------------------------------------------- $Macro SRCDIR ".." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" $Include "$SRCDIR\vpc_scripts\source_dll_base.vpc" diff --git a/game/client/c_baseentity.cpp b/game/client/c_baseentity.cpp index 8f12b04fd3..8a8b65cff8 100644 --- a/game/client/c_baseentity.cpp +++ b/game/client/c_baseentity.cpp @@ -4761,7 +4761,7 @@ C_BaseEntity *C_BaseEntity::Instance( int iEnt ) #ifdef WIN32 #pragma warning( push ) -#include +#include #pragma warning( pop ) #endif diff --git a/game/client/client_base.vpc b/game/client/client_base.vpc index 45560438bd..9bcec67574 100644 --- a/game/client/client_base.vpc +++ b/game/client/client_base.vpc @@ -16,7 +16,6 @@ $MacroRequired "GAMENAME" $Include "$SRCDIR\vpc_scripts\source_dll_base.vpc" $include "$SRCDIR\vpc_scripts\protobuf_builder.vpc" $Include "$SRCDIR\vpc_scripts\source_replay.vpc" [$TF] -$Include "$SRCDIR\game\protobuf_include.vpc" $Configuration "Debug" { @@ -506,6 +505,8 @@ $Project $File "$SRCDIR\public\haptics\haptic_msgs.cpp" [!$X360] $File "$SRCDIR\public\haptics\haptic_utils.cpp" [$WIN32&&!$X360] + $File "$SRCDIR\game\client\touch.cpp" + $Folder "Sixense" { $File "sixense\in_sixense.cpp" diff --git a/game/client/client_hl2.vpc b/game/client/client_hl2.vpc index db44981b49..112dec0327 100644 --- a/game/client/client_hl2.vpc +++ b/game/client/client_hl2.vpc @@ -9,7 +9,6 @@ $Macro GAMENAME "hl2" [!$SOURCESDK] $Macro GAMENAME "mod_hl2" [$SOURCESDK] $Include "$SRCDIR\game\client\client_base.vpc" -$Include "$SRCDIR\game\protobuf_include.vpc" $Configuration { diff --git a/game/client/client_tf.vpc b/game/client/client_tf.vpc index 7ac6361ff1..99039d4c3a 100644 --- a/game/client/client_tf.vpc +++ b/game/client/client_tf.vpc @@ -15,6 +15,7 @@ $include "$SRCDIR\game\shared\tf\tf_gcmessages_include.vpc" $Include "$SRCDIR\game\client\client_econ_base.vpc" $Include "$SRCDIR\vpc_scripts\source_saxxyawards.vpc" $Include "$SRCDIR\utils\itemtest_lib\itemtest_lib_support.vpc" [$WORKSHOP_IMPORT_ENABLE] +$Include "$SRCDIR\game\protobuf_include.vpc" $Configuration { diff --git a/game/client/hud_pdump.cpp b/game/client/hud_pdump.cpp index 612a18d7e3..666c88889b 100644 --- a/game/client/hud_pdump.cpp +++ b/game/client/hud_pdump.cpp @@ -22,7 +22,7 @@ static CPDumpPanel *g_pPDumpPanel = NULL; // retaining our own warning setup...ywb #ifdef WIN32 #pragma warning( push ) -#include +#include #pragma warning( pop ) #endif diff --git a/game/client/interpolatedvar.h b/game/client/interpolatedvar.h index b5467ad488..f0edb585e2 100644 --- a/game/client/interpolatedvar.h +++ b/game/client/interpolatedvar.h @@ -283,7 +283,7 @@ struct CInterpolatedVarEntryBase { Assert(maxCount==1); } - Type *NewEntry( Type *pValue, int maxCount, float time ) + Type *NewEntry( const Type *pValue, int maxCount, float time ) { Assert(maxCount==1); changetime = time; diff --git a/game/client/particlemgr.h b/game/client/particlemgr.h index d4537f3542..db7984f49a 100644 --- a/game/client/particlemgr.h +++ b/game/client/particlemgr.h @@ -120,7 +120,7 @@ entities. Each one is useful under different conditions. #include "utllinkedlist.h" #include "utldict.h" #ifdef WIN32 -#include +#include #else #include #endif diff --git a/game/client/physics_main_client.cpp b/game/client/physics_main_client.cpp index b1af5b23a9..9944a73d3f 100644 --- a/game/client/physics_main_client.cpp +++ b/game/client/physics_main_client.cpp @@ -7,7 +7,7 @@ #include "cbase.h" #include "c_baseentity.h" #ifdef WIN32 -#include +#include #endif #include "tier0/vprof.h" diff --git a/game/client/touch.cpp b/game/client/touch.cpp index efc258b622..a71c161efd 100644 --- a/game/client/touch.cpp +++ b/game/client/touch.cpp @@ -1,5 +1,5 @@ +#include "cbase.h" #include "convar.h" -#include #include #include "vgui/IInputInternal.h" #include "VGuiMatSurface/IMatSystemSurface.h" @@ -234,24 +234,26 @@ CON_COMMAND( touch_toggleselection, "toggle visibility on selected button in edi void CTouchControls::Init() { m_bHaveAssets = true; +#ifndef _WIN32 if( getAssets() == 0 ) { m_bHaveAssets = false; base_textureID = vgui::surface()->CreateNewTextureID(true); vgui::surface()->DrawSetTextureRGBA( base_textureID, base_img_rgba, 120, 96, 0, true ); } +#endif int w,h; engine->GetScreenSize( w, h ); screen_w = w; screen_h = h; - Msg("grid_x: %f, grid_y: %x\n", GRID_X, GRID_Y); + Msg("grid_x: %f, grid_y: %f\n", GRID_X, GRID_Y); configchanged = false; config_loaded = false; btns.EnsureCapacity( 64 ); look_finger = move_finger = resize_finger = -1; forward = side = 0; - scolor = rgba_t( -1, -1, -1, -1 ); + scolor = rgba_t( 255, 255, 255, 255 ); state = state_none; swidth = 1; move_button = edit = selection = NULL; @@ -776,7 +778,6 @@ void CTouchControls::WriteConfig() if( f ) { - CTouchButton *button; filesystem->FPrintf( f, "//=======================================================================\n"); filesystem->FPrintf( f, "//\t\t\ttouchscreen config\n" ); filesystem->FPrintf( f, "//=======================================================================\n" ); diff --git a/game/server/physics_main.cpp b/game/server/physics_main.cpp index a566f60afd..f1f9eaf815 100644 --- a/game/server/physics_main.cpp +++ b/game/server/physics_main.cpp @@ -8,7 +8,7 @@ #include "cbase.h" #ifdef _WIN32 -#include "typeinfo.h" +#include "typeinfo" // BUGBUG: typeinfo stomps some of the warning settings (in yvals.h) #pragma warning(disable:4244) #elif POSIX diff --git a/game/server/server_base.vpc b/game/server/server_base.vpc index 3d0dbecf75..f9fa0bc014 100644 --- a/game/server/server_base.vpc +++ b/game/server/server_base.vpc @@ -5,7 +5,7 @@ //----------------------------------------------------------------------------- $Macro OUTBINNAME "server" -$Macro OUTBINDIR "$SRCDIR\..\game\$GAMENAME\bin" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" $Macro DEVKITBINDIR "$GAMENAME\bin" [$X360] // It's important to include $GAMENAME in the generated_proto directory // to avoid race conditions when multiple games are in one solution. @@ -16,7 +16,6 @@ $MacroRequired "GAMENAME" $include "$SRCDIR\vpc_scripts\source_dll_base.vpc" $include "$SRCDIR\vpc_scripts\protobuf_builder.vpc" $Include "$SRCDIR\vpc_scripts\source_replay.vpc" [$TF] -$Include "$SRCDIR\game\protobuf_include.vpc" $Configuration "Debug" { diff --git a/game/server/server_tf.vpc b/game/server/server_tf.vpc index 4786b1a7ab..705db04484 100644 --- a/game/server/server_tf.vpc +++ b/game/server/server_tf.vpc @@ -11,6 +11,7 @@ $Include "$SRCDIR\game\server\server_base.vpc" $Include "$SRCDIR\game\server\server_econ_base.vpc" $include "$SRCDIR\game\shared\tf\tf_gcmessages_include.vpc" $Include "$SRCDIR\game\server\nav_mesh.vpc" +$Include "$SRCDIR\game\protobuf_include.vpc" $Configuration { diff --git a/gameui/GameUI.vpc b/gameui/GameUI.vpc index cdb83d0e2f..d3531d8505 100644 --- a/gameui/GameUI.vpc +++ b/gameui/GameUI.vpc @@ -5,7 +5,7 @@ //----------------------------------------------------------------------------- $macro SRCDIR ".." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" $include "$SRCDIR\vpc_scripts\source_dll_base.vpc" $Include "$SRCDIR\vpc_scripts\source_saxxyawards.vpc" diff --git a/inputsystem/inputsystem.vpc b/inputsystem/inputsystem.vpc index a217123333..70d0d7dad8 100644 --- a/inputsystem/inputsystem.vpc +++ b/inputsystem/inputsystem.vpc @@ -5,7 +5,7 @@ //----------------------------------------------------------------------------- $macro SRCDIR ".." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" $include "$SRCDIR\vpc_scripts\source_dll_base.vpc" @@ -13,7 +13,7 @@ $Configuration { $Compiler { - $AdditionalIncludeDirectories "$BASE;$SRCDIR\thirdparty\SDL2" [!$SDL] // If $SDL, then we already have this from source_video_base.vpc. + $AdditionalIncludeDirectories "$BASE;$SRCDIR\thirdparty\SDL" [!$SDL] // If $SDL, then we already have this from source_video_base.vpc. $PreprocessorDefinitions "$BASE;VERSION_SAFE_STEAM_API_INTERFACES" } $Linker @@ -34,6 +34,7 @@ $Project "inputsystem" $File "key_translation.cpp" $File "key_translation.h" $File "steamcontroller.cpp" + $File "touch_sdl.cpp" } $Folder "Public Headers" diff --git a/launcher/launcher.cpp b/launcher/launcher.cpp index 217db87c20..9a78c63e0d 100644 --- a/launcher/launcher.cpp +++ b/launcher/launcher.cpp @@ -1187,7 +1187,7 @@ extern void InitGL4ES(); // Output : int APIENTRY //----------------------------------------------------------------------------- #ifdef WIN32 -extern "C" __declspec(DLL_EXPORT) int LauncherMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow ) +DLL_EXPORT int LauncherMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow ) #else DLL_EXPORT int LauncherMain( int argc, char **argv ) #endif diff --git a/launcher/launcher.vpc b/launcher/launcher.vpc index daa0a14ab6..f3754b749d 100644 --- a/launcher/launcher.vpc +++ b/launcher/launcher.vpc @@ -5,7 +5,7 @@ //----------------------------------------------------------------------------- $Macro SRCDIR ".." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" $Include "$SRCDIR\vpc_scripts\source_dll_base.vpc" diff --git a/launcher_main/launcher_main.vpc b/launcher_main/launcher_main.vpc index 72dbce3341..133a3691b7 100644 --- a/launcher_main/launcher_main.vpc +++ b/launcher_main/launcher_main.vpc @@ -62,15 +62,13 @@ $Configuration // Note that the PDB must be checked in with the name it is linked as or else the debugger // will not be able to find it. That's why it is checked in as default.pdb. // override with specific behavior - $CommandLine "call $SRCDIR\vpc_scripts\valve_p4_edit.cmd $OUTBINDIR\hl2.exe $SRCDIR" "\n" \ - "call $SRCDIR\vpc_scripts\valve_p4_edit.cmd $OUTBINDIR\default.pdb $SRCDIR" "\n" \ - "copy $(TargetPath) $OUTBINDIR\hl2.exe" "\n" \ + $CommandLine "copy $(TargetPath) $OUTBINDIR\hl2.exe" "\n" \ "if ERRORLEVEL 1 goto BuildEventFailed" "\n" \ "copy $(TargetDir)\default.pdb $OUTBINDIR\default.pdb" "\n" \ "if ERRORLEVEL 1 goto BuildEventFailed" "\n" \ "if exist $(TargetDir)$(TargetName).map copy $(TargetDir)$(TargetName).map $OUTBINDIR\hl2.map" "\n" \ - "call $SRCDIR\vpc_scripts\valve_p4_edit.cmd $OUTBINDIR\hl2.dat $SRCDIR" "\n" \ - "$OUTBINDIR\bin\newdat $OUTBINDIR\hl2.exe" "\n" \ + //"call $SRCDIR\vpc_scripts\valve_p4_edit.cmd $OUTBINDIR\hl2.dat $SRCDIR" "\n" \ + //"$OUTBINDIR\bin\newdat $OUTBINDIR\hl2.exe" "\n" \ "goto BuildEventOK" "\n" \ ":BuildEventFailed" "\n" \ "echo *** ERROR! PostBuildStep FAILED for $(ProjectName)! EXE or DLL is probably running. ***" "\n" \ diff --git a/lib/public/SDL2.lib b/lib/public/SDL2.lib new file mode 100644 index 0000000000..6b3bcebd04 Binary files /dev/null and b/lib/public/SDL2.lib differ diff --git a/lib/public/appframework.lib b/lib/public/appframework.lib new file mode 100644 index 0000000000..f8fdf08099 Binary files /dev/null and b/lib/public/appframework.lib differ diff --git a/lib/public/ati_compress_mt_vc10.lib b/lib/public/ati_compress_mt_vc10.lib new file mode 100644 index 0000000000..5e208cdeea Binary files /dev/null and b/lib/public/ati_compress_mt_vc10.lib differ diff --git a/lib/public/bitmap.lib b/lib/public/bitmap.lib new file mode 100644 index 0000000000..17af1946b4 Binary files /dev/null and b/lib/public/bitmap.lib differ diff --git a/lib/public/choreoobjects.lib b/lib/public/choreoobjects.lib new file mode 100644 index 0000000000..d8201a890c Binary files /dev/null and b/lib/public/choreoobjects.lib differ diff --git a/lib/public/datamodel.lib b/lib/public/datamodel.lib new file mode 100644 index 0000000000..9ccbc205cf Binary files /dev/null and b/lib/public/datamodel.lib differ diff --git a/lib/public/dmxloader.lib b/lib/public/dmxloader.lib new file mode 100644 index 0000000000..2cae70bd6b Binary files /dev/null and b/lib/public/dmxloader.lib differ diff --git a/lib/public/libz.lib b/lib/public/libz.lib new file mode 100644 index 0000000000..805057c512 Binary files /dev/null and b/lib/public/libz.lib differ diff --git a/lib/public/mathlib.lib b/lib/public/mathlib.lib new file mode 100644 index 0000000000..594f7928ed Binary files /dev/null and b/lib/public/mathlib.lib differ diff --git a/lib/public/matsys_controls.lib b/lib/public/matsys_controls.lib new file mode 100644 index 0000000000..c7f07a1ed9 Binary files /dev/null and b/lib/public/matsys_controls.lib differ diff --git a/lib/public/nvtc.lib b/lib/public/nvtc.lib new file mode 100644 index 0000000000..643562872d Binary files /dev/null and b/lib/public/nvtc.lib differ diff --git a/lib/public/openvr_api.lib b/lib/public/openvr_api.lib new file mode 100644 index 0000000000..a2dfe5406f Binary files /dev/null and b/lib/public/openvr_api.lib differ diff --git a/lib/public/particles.lib b/lib/public/particles.lib new file mode 100644 index 0000000000..c98fcb85b4 Binary files /dev/null and b/lib/public/particles.lib differ diff --git a/lib/public/shaderlib.lib b/lib/public/shaderlib.lib new file mode 100644 index 0000000000..aaf51c8bf9 Binary files /dev/null and b/lib/public/shaderlib.lib differ diff --git a/lib/public/socketlib.lib b/lib/public/socketlib.lib new file mode 100644 index 0000000000..002776c204 Binary files /dev/null and b/lib/public/socketlib.lib differ diff --git a/lib/public/steam_api.lib b/lib/public/steam_api.lib new file mode 100644 index 0000000000..19566c1965 Binary files /dev/null and b/lib/public/steam_api.lib differ diff --git a/lib/public/tier0.lib b/lib/public/tier0.lib new file mode 100644 index 0000000000..86bc5f334f Binary files /dev/null and b/lib/public/tier0.lib differ diff --git a/lib/public/tier1.lib b/lib/public/tier1.lib new file mode 100644 index 0000000000..5a62506ed9 Binary files /dev/null and b/lib/public/tier1.lib differ diff --git a/lib/public/tier2.lib b/lib/public/tier2.lib new file mode 100644 index 0000000000..837a503dfa Binary files /dev/null and b/lib/public/tier2.lib differ diff --git a/lib/public/tier3.lib b/lib/public/tier3.lib new file mode 100644 index 0000000000..023b6d2828 Binary files /dev/null and b/lib/public/tier3.lib differ diff --git a/lib/public/vgui_controls.lib b/lib/public/vgui_controls.lib new file mode 100644 index 0000000000..24d699bc36 Binary files /dev/null and b/lib/public/vgui_controls.lib differ diff --git a/lib/public/vgui_surfacelib.lib b/lib/public/vgui_surfacelib.lib new file mode 100644 index 0000000000..a223930d31 Binary files /dev/null and b/lib/public/vgui_surfacelib.lib differ diff --git a/lib/public/vpklib.lib b/lib/public/vpklib.lib new file mode 100644 index 0000000000..7da142ad38 Binary files /dev/null and b/lib/public/vpklib.lib differ diff --git a/lib/public/vstdlib.lib b/lib/public/vstdlib.lib new file mode 100644 index 0000000000..8065a1e004 Binary files /dev/null and b/lib/public/vstdlib.lib differ diff --git a/lib/public/vtf.lib b/lib/public/vtf.lib new file mode 100644 index 0000000000..b2006032a4 Binary files /dev/null and b/lib/public/vtf.lib differ diff --git a/materialsystem/mat_stub.h b/materialsystem/mat_stub.h index 300813c7c4..ce4acb0ecf 100644 --- a/materialsystem/mat_stub.h +++ b/materialsystem/mat_stub.h @@ -76,7 +76,7 @@ public: // Texture streaming! virtual ResidencyType_t GetCurrentResidence() const { return RESIDENT_NONE; }; virtual ResidencyType_t GetTargetResidence() const { return RESIDENT_NONE; }; - virtual bool MakeResident( ResidencyType_t newResidence ) {}; + virtual bool MakeResident( ResidencyType_t newResidence ) { return false; }; virtual void UpdateLodBias() {}; // Various texture polling methods diff --git a/materialsystem/materialsystem.vpc b/materialsystem/materialsystem.vpc index 0c81acebea..6af61c8bfb 100644 --- a/materialsystem/materialsystem.vpc +++ b/materialsystem/materialsystem.vpc @@ -5,7 +5,7 @@ //----------------------------------------------------------------------------- $macro SRCDIR ".." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" $include "$SRCDIR\vpc_scripts\source_dll_base.vpc" diff --git a/materialsystem/shaderapidx9/shaderapidx10.vpc b/materialsystem/shaderapidx9/shaderapidx10.vpc index f39dd0e1c7..20243b0c25 100644 --- a/materialsystem/shaderapidx9/shaderapidx10.vpc +++ b/materialsystem/shaderapidx9/shaderapidx10.vpc @@ -5,7 +5,7 @@ //----------------------------------------------------------------------------- $macro SRCDIR "..\.." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" $Include "$SRCDIR\vpc_scripts\source_dll_base.vpc" diff --git a/materialsystem/shaderapidx9/shaderapidx8.cpp b/materialsystem/shaderapidx9/shaderapidx8.cpp index 7accc77c5e..b87d15d12b 100644 --- a/materialsystem/shaderapidx9/shaderapidx8.cpp +++ b/materialsystem/shaderapidx9/shaderapidx8.cpp @@ -3499,7 +3499,7 @@ void CShaderAPIDx8::ResetRenderState( bool bFullReset ) SetRenderState( D3DRS_CULLMODE, D3DCULL_CCW ); // No shade mode yet - m_DynamicState.m_ShadeMode = NULL; + m_DynamicState.m_ShadeMode = (D3DSHADEMODE)NULL; ShadeMode( SHADER_SMOOTH ); m_DynamicState.m_bHWMorphingEnabled = false; diff --git a/materialsystem/shaderapidx9/shaderapidx9.vpc b/materialsystem/shaderapidx9/shaderapidx9.vpc index dbeea1e7e2..167a719cec 100644 --- a/materialsystem/shaderapidx9/shaderapidx9.vpc +++ b/materialsystem/shaderapidx9/shaderapidx9.vpc @@ -5,7 +5,7 @@ //----------------------------------------------------------------------------- $Macro SRCDIR "..\.." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" $Macro OUTBINNAME "shaderapidx9" $include "$SRCDIR\vpc_scripts\source_dll_base.vpc" diff --git a/materialsystem/stdshaders/stdshader_dbg.vpc b/materialsystem/stdshaders/stdshader_dbg.vpc index 30201811fb..d07acfdf8c 100644 --- a/materialsystem/stdshaders/stdshader_dbg.vpc +++ b/materialsystem/stdshaders/stdshader_dbg.vpc @@ -5,7 +5,7 @@ //----------------------------------------------------------------------------- $macro SRCDIR "..\.." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" // shader_dll_verify.cpp defines a function called _ftol3. This means that we can't // link with the bug-fixed ftol3.obj. It also means we can't convert float-to-unsigned. diff --git a/materialsystem/stdshaders/stdshader_dx6.vpc b/materialsystem/stdshaders/stdshader_dx6.vpc index daca60d05e..0740e07ed1 100644 --- a/materialsystem/stdshaders/stdshader_dx6.vpc +++ b/materialsystem/stdshaders/stdshader_dx6.vpc @@ -5,7 +5,7 @@ //----------------------------------------------------------------------------- $Macro SRCDIR "..\.." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" // shader_dll_verify.cpp defines a function called _ftol3. This means that we can't // link with the bug-fixed ftol3.obj. It also means we can't convert float-to-unsigned. diff --git a/materialsystem/stdshaders/stdshader_dx7.vpc b/materialsystem/stdshaders/stdshader_dx7.vpc index 12a9a05832..30bb028e0e 100644 --- a/materialsystem/stdshaders/stdshader_dx7.vpc +++ b/materialsystem/stdshaders/stdshader_dx7.vpc @@ -5,7 +5,7 @@ //----------------------------------------------------------------------------- $Macro SRCDIR "..\.." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" // shader_dll_verify.cpp defines a function called _ftol3. This means that we can't // link with the bug-fixed ftol3.obj. It also means we can't convert float-to-unsigned. diff --git a/materialsystem/stdshaders/stdshader_dx8.vpc b/materialsystem/stdshaders/stdshader_dx8.vpc index 9d6eca1d04..2eabff7ac7 100644 --- a/materialsystem/stdshaders/stdshader_dx8.vpc +++ b/materialsystem/stdshaders/stdshader_dx8.vpc @@ -5,7 +5,7 @@ //----------------------------------------------------------------------------- $Macro SRCDIR "..\.." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" // shader_dll_verify.cpp defines a function called _ftol3. This means that we can't // link with the bug-fixed ftol3.obj. It also means we can't convert float-to-unsigned. diff --git a/materialsystem/stdshaders/stdshader_dx9.vpc b/materialsystem/stdshaders/stdshader_dx9.vpc index 575f687a84..46428bde3c 100644 --- a/materialsystem/stdshaders/stdshader_dx9.vpc +++ b/materialsystem/stdshaders/stdshader_dx9.vpc @@ -5,7 +5,7 @@ //----------------------------------------------------------------------------- $Macro SRCDIR "..\.." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" // shader_dll_verify.cpp defines a function called _ftol3. This means that we can't // link with the bug-fixed ftol3.obj. It also means we can't convert float-to-unsigned. diff --git a/networksystem/networksystem.vpc b/networksystem/networksystem.vpc index b73375b8a1..5146263b36 100644 --- a/networksystem/networksystem.vpc +++ b/networksystem/networksystem.vpc @@ -5,7 +5,7 @@ //----------------------------------------------------------------------------- $Macro SRCDIR ".." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" $Include "$SRCDIR\vpc_scripts\source_dll_base.vpc" diff --git a/public/Color.h b/public/Color.h index 0d6d292df6..d9ff9bfc2a 100644 --- a/public/Color.h +++ b/public/Color.h @@ -83,12 +83,12 @@ public: return _color[index]; } - bool operator == (const Color &rhs) + bool operator == (const Color &rhs) const { return Q_memcmp( this, &rhs, sizeof(Color) ) == 0; } - bool operator != (const Color &rhs) + bool operator != (const Color &rhs) const { return !(operator==(rhs)); } diff --git a/public/tier0/memalloc.h b/public/tier0/memalloc.h index 0a1c089538..ee75165c22 100644 --- a/public/tier0/memalloc.h +++ b/public/tier0/memalloc.h @@ -383,7 +383,7 @@ public: #pragma warning(disable:4290) #pragma warning(push) - #include + #include // MEM_DEBUG_CLASSNAME is opt-in. // Note: typeid().name() is not threadsafe, so if the project needs to access it in multiple threads diff --git a/public/tier0/memoverride.cpp b/public/tier0/memoverride.cpp index 57d3f4cbda..41008863dd 100644 --- a/public/tier0/memoverride.cpp +++ b/public/tier0/memoverride.cpp @@ -203,12 +203,12 @@ ALLOC_CALL void *_realloc_base( void *pMem, size_t nSize ) return ReallocUnattributed( pMem, nSize ); } -ALLOC_CALL void *_recalloc_base( void *pMem, size_t nSize ) +ALLOC_CALL void *_recalloc_base( void *pMem, size_t nCount, size_t nSize ) { - void *pMemOut = ReallocUnattributed( pMem, nSize ); + void *pMemOut = ReallocUnattributed( pMem, nCount * nSize ); if ( !pMem ) { - memset( pMemOut, 0, nSize ); + memset( pMemOut, 0, nCount * nSize); } return pMemOut; } @@ -242,7 +242,7 @@ void * __cdecl _realloc_crt(void *ptr, size_t size) void * __cdecl _recalloc_crt(void *ptr, size_t count, size_t size) { - return _recalloc_base( ptr, size * count ); + return _recalloc_base( ptr, size, count ); } ALLOC_CALL void * __cdecl _recalloc ( void * memblock, size_t count, size_t size ) diff --git a/replay/replay.vpc b/replay/replay.vpc index 70b80e391b..711cec713b 100644 --- a/replay/replay.vpc +++ b/replay/replay.vpc @@ -9,7 +9,7 @@ //----------------------------------------------------------------------------- $macro SRCDIR ".." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" // NOTE: We don't want to include source_replay.vpc here. The only purpose // REPLAY_ENABLED // serves in this project is for includes like netmessages.h diff --git a/scenefilecache/scenefilecache.vpc b/scenefilecache/scenefilecache.vpc index ee6460de4f..d3972951b2 100644 --- a/scenefilecache/scenefilecache.vpc +++ b/scenefilecache/scenefilecache.vpc @@ -5,7 +5,7 @@ //----------------------------------------------------------------------------- $Macro SRCDIR ".." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" $Include "$SRCDIR\vpc_scripts\source_dll_base.vpc" diff --git a/serverbrowser/CustomGames.cpp b/serverbrowser/CustomGames.cpp index 6ccd33fe86..b5adcb7183 100644 --- a/serverbrowser/CustomGames.cpp +++ b/serverbrowser/CustomGames.cpp @@ -211,7 +211,7 @@ bool CCustomGames::CheckTagFilter( gameserveritem_t &server ) V_SplitString( m_szTagFilter, ",", TagList ); for ( int i = 0; i < TagList.Count(); i++ ) { - if ( ( Q_strnistr( server.m_szGameTags, TagList[i], MAX_TAG_CHARACTERS ) ) == TagsExclude() ) + if ( ( Q_strnistr( server.m_szGameTags, TagList[i], MAX_TAG_CHARACTERS ) ) == (const char*)TagsExclude() ) { bRetVal = false; break; diff --git a/serverbrowser/ServerBrowser.vpc b/serverbrowser/ServerBrowser.vpc index 548a3b7fe0..6bfedde491 100644 --- a/serverbrowser/ServerBrowser.vpc +++ b/serverbrowser/ServerBrowser.vpc @@ -5,7 +5,7 @@ //----------------------------------------------------------------------------- $Macro SRCDIR ".." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" $Include "$SRCDIR\vpc_scripts\source_dll_base.vpc" diff --git a/soundemittersystem/soundemittersystem.vpc b/soundemittersystem/soundemittersystem.vpc index f8ca82fe99..62ad4ae677 100644 --- a/soundemittersystem/soundemittersystem.vpc +++ b/soundemittersystem/soundemittersystem.vpc @@ -5,7 +5,7 @@ //----------------------------------------------------------------------------- $Macro SRCDIR ".." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" $Include "$SRCDIR\vpc_scripts\source_dll_base.vpc" diff --git a/soundsystem/soundsystem.vpc b/soundsystem/soundsystem.vpc index 2653ca5a67..d502d87aa9 100644 --- a/soundsystem/soundsystem.vpc +++ b/soundsystem/soundsystem.vpc @@ -5,7 +5,7 @@ //----------------------------------------------------------------------------- $Macro SRCDIR ".." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" $Include "$SRCDIR\vpc_scripts\source_dll_base.vpc" diff --git a/studiorender/studiorender.vpc b/studiorender/studiorender.vpc index 4876d438c6..84fc6076cf 100644 --- a/studiorender/studiorender.vpc +++ b/studiorender/studiorender.vpc @@ -5,7 +5,7 @@ //----------------------------------------------------------------------------- $macro SRCDIR ".." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" $include "$SRCDIR\vpc_scripts\source_dll_base.vpc" diff --git a/tier0/tier0.vpc b/tier0/tier0.vpc index 0d7b1f5e24..7e82de4a76 100644 --- a/tier0/tier0.vpc +++ b/tier0/tier0.vpc @@ -7,7 +7,7 @@ $MacroRequired "PLATSUBDIR" $Macro SRCDIR ".." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" $Include "$SRCDIR\vpc_scripts\source_dll_base.vpc" diff --git a/tier1/interface.cpp b/tier1/interface.cpp index 96dd90c903..047a27da6b 100644 --- a/tier1/interface.cpp +++ b/tier1/interface.cpp @@ -278,7 +278,9 @@ CSysModule *Sys_LoadModule( const char *pModuleName, Sys_Flags flags /* = SYS_NO // file in the depot (MFP) or a filesystem GetLocalCopy() call must be made // prior to the call to this routine. char szCwd[1024]; +#ifdef POSIX char szModuleName[1024]; +#endif HMODULE hDLL = NULL; if ( !Q_IsAbsolutePath( pModuleName ) ) @@ -300,8 +302,6 @@ CSysModule *Sys_LoadModule( const char *pModuleName, Sys_Flags flags /* = SYS_NO } char szAbsoluteModuleName[1024]; - size_t cCwd = strlen( szCwd ); - bool bUseLibPrefix = false; #ifdef ANDROID diff --git a/togl/togl.vpc b/togl/togl.vpc index dadbcd7292..9be21dd7db 100644 --- a/togl/togl.vpc +++ b/togl/togl.vpc @@ -6,7 +6,7 @@ $Macro SRCDIR ".." [$WIN32] $Macro SRCDIR ".." [!$WIN32] -$Macro OUTBINDIR $LIBPUBLIC +$Macro OUTBINDIR "$SRCDIR\..\game\bin" $Macro OUTBINNAME "togl" $Macro TOGL_SRCDIR "$SRCDIR/togl/linuxwin" $Macro TOGL_INCDIR "$SRCDIR/public/togl/linuxwin" diff --git a/togles/togl.vpc b/togles/togl.vpc index dadbcd7292..9be21dd7db 100644 --- a/togles/togl.vpc +++ b/togles/togl.vpc @@ -6,7 +6,7 @@ $Macro SRCDIR ".." [$WIN32] $Macro SRCDIR ".." [!$WIN32] -$Macro OUTBINDIR $LIBPUBLIC +$Macro OUTBINDIR "$SRCDIR\..\game\bin" $Macro OUTBINNAME "togl" $Macro TOGL_SRCDIR "$SRCDIR/togl/linuxwin" $Macro TOGL_INCDIR "$SRCDIR/public/togl/linuxwin" diff --git a/unicode/unicode.vpc b/unicode/unicode.vpc index 5b0f3e207a..9c90cf0fbe 100644 --- a/unicode/unicode.vpc +++ b/unicode/unicode.vpc @@ -5,7 +5,7 @@ //----------------------------------------------------------------------------- $Macro SRCDIR ".." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" $Include "$SRCDIR\vpc_scripts\source_dll_base.vpc" diff --git a/utils/bsppack/bsppack.vpc b/utils/bsppack/bsppack.vpc index ca35d9cec0..602757e847 100644 --- a/utils/bsppack/bsppack.vpc +++ b/utils/bsppack/bsppack.vpc @@ -5,7 +5,7 @@ //----------------------------------------------------------------------------- $macro SRCDIR "..\.." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" $include "$SRCDIR\vpc_scripts\source_dll_base.vpc" diff --git a/vgui2/src/vgui_dll.vpc b/vgui2/src/vgui_dll.vpc index 2de1268b2b..e92dea6d9d 100644 --- a/vgui2/src/vgui_dll.vpc +++ b/vgui2/src/vgui_dll.vpc @@ -5,7 +5,7 @@ //----------------------------------------------------------------------------- $Macro SRCDIR "..\.." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" $Macro OUTBINNAME "vgui2" $include "$SRCDIR\vpc_scripts\source_dll_base.vpc" diff --git a/vguimatsurface/asanstubs.cpp b/vguimatsurface/asanstubs.cpp index 3705250729..63f7dc4fdf 100644 --- a/vguimatsurface/asanstubs.cpp +++ b/vguimatsurface/asanstubs.cpp @@ -70,10 +70,12 @@ void VPanel::SetEnabled(bool state) bool VPanel::IsVisible() { + return false; } bool VPanel::IsEnabled() { + return false; } void VPanel::GetAbsPos(int &x, int &y) @@ -110,8 +112,10 @@ VPanel *VPanel::GetChild(int index) return NULL; } +CUtlVector< VPanel *> panels; CUtlVector< VPanel *> &VPanel::GetChildren() { + return panels; // return NULL; } @@ -153,6 +157,7 @@ void VPanel::SetPlat(SurfacePlat *Plat) bool VPanel::IsPopup() { + return false; } void VPanel::SetPopup(bool state) diff --git a/vguimatsurface/vguimatsurface.vpc b/vguimatsurface/vguimatsurface.vpc index 9e05948854..2743739fce 100644 --- a/vguimatsurface/vguimatsurface.vpc +++ b/vguimatsurface/vguimatsurface.vpc @@ -5,7 +5,7 @@ //----------------------------------------------------------------------------- $macro SRCDIR ".." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" $include "$SRCDIR\vpc_scripts\source_dll_base.vpc" diff --git a/video/video_quicktime.vpc b/video/video_quicktime.vpc index 80f4cdb412..c9f6cd9b4d 100644 --- a/video/video_quicktime.vpc +++ b/video/video_quicktime.vpc @@ -9,7 +9,7 @@ //----------------------------------------------------------------------------- $Macro SRCDIR ".." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" $Include "$SRCDIR\vpc_scripts\source_dll_base.vpc" diff --git a/video/video_services.vpc b/video/video_services.vpc index b9ccbcb8fc..fcc0eade5f 100644 --- a/video/video_services.vpc +++ b/video/video_services.vpc @@ -11,7 +11,7 @@ //----------------------------------------------------------------------------- $Macro SRCDIR ".." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" $Include "$SRCDIR\vpc_scripts\source_dll_base.vpc" diff --git a/video/video_webm.vpc b/video/video_webm.vpc index b1f326a8df..379dd97f07 100644 --- a/video/video_webm.vpc +++ b/video/video_webm.vpc @@ -8,7 +8,7 @@ //----------------------------------------------------------------------------- $Macro SRCDIR ".." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" $Include "$SRCDIR\vpc_scripts\source_dll_base.vpc" diff --git a/vpc_scripts/fbx.vpc b/vpc_scripts/fbx.vpc new file mode 100644 index 0000000000..88bd9eaa6c --- /dev/null +++ b/vpc_scripts/fbx.vpc @@ -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] + } +} diff --git a/vpc_scripts/fbx_base.vpc b/vpc_scripts/fbx_base.vpc new file mode 100644 index 0000000000..9f0f9b3e66 --- /dev/null +++ b/vpc_scripts/fbx_base.vpc @@ -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] + } +} diff --git a/vpc_scripts/groups.vgc b/vpc_scripts/groups.vgc index 35c6323ce1..e816e3179a 100644 --- a/vpc_scripts/groups.vgc +++ b/vpc_scripts/groups.vgc @@ -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" diff --git a/vpc_scripts/source_dll_win32_base.vpc b/vpc_scripts/source_dll_win32_base.vpc index 8dbfca73bf..3266a7371b 100644 --- a/vpc_scripts/source_dll_win32_base.vpc +++ b/vpc_scripts/source_dll_win32_base.vpc @@ -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" } diff --git a/vpc_scripts/source_exe_win_win32_base.vpc b/vpc_scripts/source_exe_win_win32_base.vpc index a2704b197a..9d68e3c977 100644 --- a/vpc_scripts/source_exe_win_win32_base.vpc +++ b/vpc_scripts/source_exe_win_win32_base.vpc @@ -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" } diff --git a/vpc_scripts/source_lib_win32_base.vpc b/vpc_scripts/source_lib_win32_base.vpc index 1bc4f7fe14..88970d5119 100644 --- a/vpc_scripts/source_lib_win32_base.vpc +++ b/vpc_scripts/source_lib_win32_base.vpc @@ -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 diff --git a/vpc_scripts/source_video_base.vpc b/vpc_scripts/source_video_base.vpc index 5e4ec453e1..6cc206745b 100644 --- a/vpc_scripts/source_video_base.vpc +++ b/vpc_scripts/source_video_base.vpc @@ -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] } } diff --git a/vpc_scripts/source_win32_base.vpc b/vpc_scripts/source_win32_base.vpc index 454cde3ff8..d08fca76bb 100644 --- a/vpc_scripts/source_win32_base.vpc +++ b/vpc_scripts/source_win32_base.vpc @@ -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] diff --git a/vphysics/vphysics.vpc b/vphysics/vphysics.vpc index 698c41a75d..0c00da4e39 100644 --- a/vphysics/vphysics.vpc +++ b/vphysics/vphysics.vpc @@ -5,7 +5,7 @@ //----------------------------------------------------------------------------- $macro SRCDIR ".." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" $include "$SRCDIR\vpc_scripts\source_dll_base.vpc" diff --git a/vpklib/packedstore.cpp b/vpklib/packedstore.cpp index 8b7d7ba73f..c4c346e3b1 100644 --- a/vpklib/packedstore.cpp +++ b/vpklib/packedstore.cpp @@ -634,11 +634,10 @@ void CPackedStore::Write( void ) // Do we plan on signing this thing and writing a signature? m_Signature.Purge(); - uint32 nExpectedSignatureSize = 0; if ( m_SignaturePrivateKey.Count() > 0 && m_SignaturePublicKey.Count() > 0 ) { #ifdef VPK_ENABLE_SIGNING - nExpectedSignatureSize = k_cubRSASignature; + uint32 nExpectedSignatureSize = k_cubRSASignature; headerOut.m_nSignatureSize = sizeof(uint32) + m_SignaturePublicKey.Count() + sizeof(uint32) + nExpectedSignatureSize; #else Error( "VPK signing not implemented" ); diff --git a/vstdlib/vstdlib.vpc b/vstdlib/vstdlib.vpc index 6de75ca817..89c2214fd7 100644 --- a/vstdlib/vstdlib.vpc +++ b/vstdlib/vstdlib.vpc @@ -5,7 +5,7 @@ //----------------------------------------------------------------------------- $Macro SRCDIR ".." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" $include "$SRCDIR\vpc_scripts\source_dll_base.vpc"