From 53e78c503e6e9c7d15e2eefc480755fe37dd7077 Mon Sep 17 00:00:00 2001
From: Joe Ludwig <joe@valvesoftware.com>
Date: Thu, 15 May 2014 13:59:18 -0700
Subject: General: *         Upgraded Steamworks SDK to v1.29 *         Fixed
 mod compatibility problem with Multiplayer Base that was introduced in
 September. *         In Hammer, while using the Vertex Tool, pressing CTRL+B
 will snap selected vertices to the grid.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Virtual Reality:
*         Mods that support virtual reality now need to have a line in gameinfo.txt that says “supportsvr 1”. This indicates to gameui and engine that certain UI should be enabled.
*         VR-enabled mods will now start up in VR mode when launched from Steam’s VR mode.

Windows:
*         Upgraded to Visual Studio 2013. If you need to build projects for VS 2010, add /2010 to your VPC command line.

OSX:
*         Upgraded to XCode 5.
---
 mp/src/devtools/base.xcconfig           |   4 ++--
 mp/src/devtools/bin/vpc.exe             | Bin 1135616 -> 1104384 bytes
 mp/src/devtools/bin/vpc_linux           | Bin 1178799 -> 1179007 bytes
 mp/src/devtools/bin/vpc_osx             | Bin 1098528 -> 1000264 bytes
 mp/src/devtools/makefile_base_posix.mak |   4 ++--
 mp/src/devtools/release.xcconfig        |   2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'mp/src/devtools')

diff --git a/mp/src/devtools/base.xcconfig b/mp/src/devtools/base.xcconfig
index ff8a9782..0f0960d3 100644
--- a/mp/src/devtools/base.xcconfig
+++ b/mp/src/devtools/base.xcconfig
@@ -25,7 +25,7 @@ GCC_REUSE_STRINGS = YES
 // following line to the xcconfig:
 // CLANG_CXX_LIBRARY = libc++
 GCC_PREPROCESSOR_DEFINITIONS = _DLL_EXT=.dylib NO_MALLOC_OVERRIDE=1 VPROF_LEVEL=1 NO_HOOK_MALLOC=1 PNG_NO_PEDANTIC_WARNINGS CPP11_NO_LIBCXX
-BASE_CFLAGS= -Usprintf -Ustrncpy -UPROTECTED_THINGS_ENABLE
+BASE_CFLAGS= -Usprintf -Ustrncpy -UPROTECTED_THINGS_ENABLE -ftemplate-depth=512
 
 GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO
 WARNING_CFLAGS = -Wno-deprecated-writable-strings -Wno-switch-enum -Wno-switch -Wno-unused-value -Wno-parentheses -Wno-logical-op-parentheses -Wno-c++11-narrowing
@@ -41,6 +41,6 @@ CLANG_CXX_LANGUAGE_STANDARD = gnu++11
 // gets into the header map, so sacrifice speed for corectness.
 USE_HEADERMAP = NO
 
-SDKROOT = macosx10.7
+SDKROOT = macosx10.9
 MACOSX_DEPLOYMENT_TARGET = 10.5
 GCC_FAST_MATH = YES
diff --git a/mp/src/devtools/bin/vpc.exe b/mp/src/devtools/bin/vpc.exe
index fcadab1c..3ee8b0e6 100644
Binary files a/mp/src/devtools/bin/vpc.exe and b/mp/src/devtools/bin/vpc.exe differ
diff --git a/mp/src/devtools/bin/vpc_linux b/mp/src/devtools/bin/vpc_linux
index 47a07ba5..55c29561 100755
Binary files a/mp/src/devtools/bin/vpc_linux and b/mp/src/devtools/bin/vpc_linux differ
diff --git a/mp/src/devtools/bin/vpc_osx b/mp/src/devtools/bin/vpc_osx
index d3ab3de6..4a7cdc37 100755
Binary files a/mp/src/devtools/bin/vpc_osx and b/mp/src/devtools/bin/vpc_osx differ
diff --git a/mp/src/devtools/makefile_base_posix.mak b/mp/src/devtools/makefile_base_posix.mak
index 8b32dec5..cd5f498a 100644
--- a/mp/src/devtools/makefile_base_posix.mak
+++ b/mp/src/devtools/makefile_base_posix.mak
@@ -42,9 +42,9 @@ CFLAGS = $(ARCH_FLAGS) $(CPPFLAGS) $(WARN_FLAGS) -fvisibility=$(SymbolVisibility
 # In -std=gnu++0x mode we get lots of errors about "error: narrowing conversion". -fpermissive
 # turns these into warnings in gcc, and -Wno-c++11-narrowing suppresses them entirely in clang 3.1+.
 ifeq ($(CXX),clang++)
-	CXXFLAGS = $(CFLAGS) -Wno-c++11-narrowing
+	CXXFLAGS = $(CFLAGS) -std=gnu++0x -Wno-c++11-narrowing -Wno-dangling-else
 else
-	CXXFLAGS = $(CFLAGS) -fpermissive
+	CXXFLAGS = $(CFLAGS) -std=gnu++0x -fpermissive
 endif
 DEFINES += -DVPROF_LEVEL=1 -DGNUC -DNO_HOOK_MALLOC -DNO_MALLOC_OVERRIDE
 LDFLAGS = $(CFLAGS) $(GCC_ExtraLinkerFlags) $(OptimizerLevel)
diff --git a/mp/src/devtools/release.xcconfig b/mp/src/devtools/release.xcconfig
index 1f1a24ef..d9258588 100644
--- a/mp/src/devtools/release.xcconfig
+++ b/mp/src/devtools/release.xcconfig
@@ -1,4 +1,4 @@
 #include "base.xcconfig"
 
 GCC_OPTIMIZATION_LEVEL = 2
-OTHER_CFLAGS = $(derived) $(BASE_CFLAGS) -ftree-vectorize -fpredictive-commoning -funswitch-loops
+OTHER_CFLAGS = $(derived) $(BASE_CFLAGS) -ftree-vectorize -funswitch-loops
-- 
cgit v1.2.3