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

1 files changed, 61 insertions, 61 deletions

diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/scons/SConstruct b/mp/src/thirdparty/protobuf-2.3.0/gtest/scons/SConstruct
index 8d3d1c49..1f2f37f6 100644
--- a/mp/src/thirdparty/protobuf-2.3.0/gtest/scons/SConstruct
+++ b/mp/src/thirdparty/protobuf-2.3.0/gtest/scons/SConstruct
@@ -1,61 +1,61 @@
-# -*- Python -*-

-# Copyright 2008 Google Inc. All Rights Reserved.

-#

-# Redistribution and use in source and binary forms, with or without

-# modification, are permitted provided that the following conditions are

-# met:

-#

-#     * Redistributions of source code must retain the above copyright

-# notice, this list of conditions and the following disclaimer.

-#     * Redistributions in binary form must reproduce the above

-# copyright notice, this list of conditions and the following disclaimer

-# in the documentation and/or other materials provided with the

-# distribution.

-#     * Neither the name of Google Inc. nor the names of its

-# contributors may be used to endorse or promote products derived from

-# this software without specific prior written permission.

-#

-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-#

-# Author: [email protected] (Joi Sigurdsson)

-# Author: [email protected] (Vlad Losev)

-#

-# Base build file for Google Test Tests.

-#

-# Usage:

-#   cd to the directory with this file, then

-#   ./scons.py [OPTIONS]

-#

-# where frequently used command-line options include:

-#     -h               print usage help.

-#     BUILD=all        build all build types.

-#     BUILD=win-opt    build the given build type.

-

-EnsurePythonVersion(2, 3)

-

-sconstruct_helper = SConscript('SConstruct.common')

-

-sconstruct_helper.Initialize(build_root_path='..',

-                             support_multiple_win_builds=False)

-

-win_base = sconstruct_helper.MakeWinBaseEnvironment()

-

-if win_base.get('MSVS_VERSION', None) == '7.1':

-  sconstruct_helper.AllowVc71StlWithoutExceptions(win_base)

-

-sconstruct_helper.MakeWinDebugEnvironment(win_base, 'win-dbg')

-sconstruct_helper.MakeWinOptimizedEnvironment(win_base, 'win-opt')

-

-sconstruct_helper.ConfigureGccEnvironments()

-

-sconstruct_helper.BuildSelectedEnvironments()

+# -*- Python -*-
+# Copyright 2008 Google Inc. All Rights Reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Author: [email protected] (Joi Sigurdsson)
+# Author: [email protected] (Vlad Losev)
+#
+# Base build file for Google Test Tests.
+#
+# Usage:
+#   cd to the directory with this file, then
+#   ./scons.py [OPTIONS]
+#
+# where frequently used command-line options include:
+#     -h               print usage help.
+#     BUILD=all        build all build types.
+#     BUILD=win-opt    build the given build type.
+
+EnsurePythonVersion(2, 3)
+
+sconstruct_helper = SConscript('SConstruct.common')
+
+sconstruct_helper.Initialize(build_root_path='..',
+                             support_multiple_win_builds=False)
+
+win_base = sconstruct_helper.MakeWinBaseEnvironment()
+
+if win_base.get('MSVS_VERSION', None) == '7.1':
+  sconstruct_helper.AllowVc71StlWithoutExceptions(win_base)
+
+sconstruct_helper.MakeWinDebugEnvironment(win_base, 'win-dbg')
+sconstruct_helper.MakeWinOptimizedEnvironment(win_base, 'win-opt')
+
+sconstruct_helper.ConfigureGccEnvironments()
+
+sconstruct_helper.BuildSelectedEnvironments()