Updated the SDK with the latest code from the TF and HL2 branches.

1 files changed, 78 insertions, 78 deletions

diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/make/Makefile b/mp/src/thirdparty/protobuf-2.3.0/gtest/make/Makefile
index 8a6504e3..2d8806eb 100644
--- a/mp/src/thirdparty/protobuf-2.3.0/gtest/make/Makefile
+++ b/mp/src/thirdparty/protobuf-2.3.0/gtest/make/Makefile
@@ -1,78 +1,78 @@
-# A sample Makefile for building Google Test and using it in user

-# tests.  Please tweak it to suit your environment and project.  You

-# may want to move it to your project's root directory.

-#

-# SYNOPSIS:

-#

-#   make [all]  - makes everything.

-#   make TARGET - makes the given target.

-#   make clean  - removes all files generated by make.

-

-# Please tweak the following variable definitions as needed by your

-# project, except GTEST_HEADERS, which you can use in your own targets

-# but shouldn't modify.

-

-# Points to the root of Google Test, relative to where this file is.

-# Remember to tweak this if you move this file.

-GTEST_DIR = ..

-

-# Where to find user code.

-USER_DIR = ../samples

-

-# Flags passed to the preprocessor.

-CPPFLAGS += -I$(GTEST_DIR) -I$(GTEST_DIR)/include

-

-# Flags passed to the C++ compiler.

-CXXFLAGS += -g -Wall -Wextra

-

-# All tests produced by this Makefile.  Remember to add new tests you

-# created to the list.

-TESTS = sample1_unittest

-

-# All Google Test headers.  Usually you shouldn't change this

-# definition.

-GTEST_HEADERS = $(GTEST_DIR)/include/gtest/*.h \

-                $(GTEST_DIR)/include/gtest/internal/*.h

-

-# House-keeping build targets.

-

-all : $(TESTS)

-

-clean :

-	rm -f $(TESTS) gtest.a gtest_main.a *.o

-

-# Builds gtest.a and gtest_main.a.

-

-# Usually you shouldn't tweak such internal variables, indicated by a

-# trailing _.

-GTEST_SRCS_ = $(GTEST_DIR)/src/*.cc $(GTEST_DIR)/src/*.h $(GTEST_HEADERS)

-

-# For simplicity and to avoid depending on Google Test's

-# implementation details, the dependencies specified below are

-# conservative and not optimized.  This is fine as Google Test

-# compiles fast and for ordinary users its source rarely changes.

-gtest-all.o : $(GTEST_SRCS_)

-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(GTEST_DIR)/src/gtest-all.cc

-

-gtest_main.o : $(GTEST_SRCS_)

-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(GTEST_DIR)/src/gtest_main.cc

-

-gtest.a : gtest-all.o

-	$(AR) $(ARFLAGS) $@ $^

-

-gtest_main.a : gtest-all.o gtest_main.o

-	$(AR) $(ARFLAGS) $@ $^

-

-# Builds a sample test.  A test should link with either gtest.a or

-# gtest_main.a, depending on whether it defines its own main()

-# function.

-

-sample1.o : $(USER_DIR)/sample1.cc $(USER_DIR)/sample1.h $(GTEST_HEADERS)

-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/sample1.cc

-

-sample1_unittest.o : $(USER_DIR)/sample1_unittest.cc \

-                     $(USER_DIR)/sample1.h $(GTEST_HEADERS)

-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/sample1_unittest.cc

-

-sample1_unittest : sample1.o sample1_unittest.o gtest_main.a

-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $^ -o $@

+# A sample Makefile for building Google Test and using it in user
+# tests.  Please tweak it to suit your environment and project.  You
+# may want to move it to your project's root directory.
+#
+# SYNOPSIS:
+#
+#   make [all]  - makes everything.
+#   make TARGET - makes the given target.
+#   make clean  - removes all files generated by make.
+
+# Please tweak the following variable definitions as needed by your
+# project, except GTEST_HEADERS, which you can use in your own targets
+# but shouldn't modify.
+
+# Points to the root of Google Test, relative to where this file is.
+# Remember to tweak this if you move this file.
+GTEST_DIR = ..
+
+# Where to find user code.
+USER_DIR = ../samples
+
+# Flags passed to the preprocessor.
+CPPFLAGS += -I$(GTEST_DIR) -I$(GTEST_DIR)/include
+
+# Flags passed to the C++ compiler.
+CXXFLAGS += -g -Wall -Wextra
+
+# All tests produced by this Makefile.  Remember to add new tests you
+# created to the list.
+TESTS = sample1_unittest
+
+# All Google Test headers.  Usually you shouldn't change this
+# definition.
+GTEST_HEADERS = $(GTEST_DIR)/include/gtest/*.h \
+                $(GTEST_DIR)/include/gtest/internal/*.h
+
+# House-keeping build targets.
+
+all : $(TESTS)
+
+clean :
+	rm -f $(TESTS) gtest.a gtest_main.a *.o
+
+# Builds gtest.a and gtest_main.a.
+
+# Usually you shouldn't tweak such internal variables, indicated by a
+# trailing _.
+GTEST_SRCS_ = $(GTEST_DIR)/src/*.cc $(GTEST_DIR)/src/*.h $(GTEST_HEADERS)
+
+# For simplicity and to avoid depending on Google Test's
+# implementation details, the dependencies specified below are
+# conservative and not optimized.  This is fine as Google Test
+# compiles fast and for ordinary users its source rarely changes.
+gtest-all.o : $(GTEST_SRCS_)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(GTEST_DIR)/src/gtest-all.cc
+
+gtest_main.o : $(GTEST_SRCS_)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(GTEST_DIR)/src/gtest_main.cc
+
+gtest.a : gtest-all.o
+	$(AR) $(ARFLAGS) $@ $^
+
+gtest_main.a : gtest-all.o gtest_main.o
+	$(AR) $(ARFLAGS) $@ $^
+
+# Builds a sample test.  A test should link with either gtest.a or
+# gtest_main.a, depending on whether it defines its own main()
+# function.
+
+sample1.o : $(USER_DIR)/sample1.cc $(USER_DIR)/sample1.h $(GTEST_HEADERS)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/sample1.cc
+
+sample1_unittest.o : $(USER_DIR)/sample1_unittest.cc \
+                     $(USER_DIR)/sample1.h $(GTEST_HEADERS)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/sample1_unittest.cc
+
+sample1_unittest : sample1.o sample1_unittest.o gtest_main.a
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $^ -o $@