diff options
| author | Jørgen P. Tjernø <[email protected]> | 2013-12-02 21:24:06 -0800 |
|---|---|---|
| committer | Jørgen P. Tjernø <[email protected]> | 2013-12-02 21:24:06 -0800 |
| commit | 2861c3fbfc41d49627810b2d8d9bda761c3528c2 (patch) | |
| tree | b33b1fb836b25fdc13958bca70530e31021bbbc9 /mp/src | |
| parent | Fix IceKey.H to be a text file too. (diff) | |
| download | source-sdk-2013-2861c3fbfc41d49627810b2d8d9bda761c3528c2.tar.xz source-sdk-2013-2861c3fbfc41d49627810b2d8d9bda761c3528c2.zip | |
Make .xcconfigs text files too.
Diffstat (limited to 'mp/src')
9 files changed, 200 insertions, 200 deletions
diff --git a/mp/src/devtools/base.xcconfig b/mp/src/devtools/base.xcconfig index d5ba4a16..ff8a9782 100644 --- a/mp/src/devtools/base.xcconfig +++ b/mp/src/devtools/base.xcconfig @@ -1,46 +1,46 @@ -ALWAYS_SEARCH_USER_PATHS = YES
-HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) $(SDKROOT)/usr/include/malloc
-
-ARCHS = i386
-ONLY_ACTIVE_ARCH = NO
-COPY_PHASE_STRIP = NO
-DEBUG_INFORMATION_FORMAT = dwarf-with-dsym
-
-DEAD_CODE_STRIPPING = YES
-PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES
-
-GCC_C_LANGUAGE_STANDARD = gnu99
-GCC_ENABLE_OBJC_EXCEPTIONS = YES
-GCC_SYMBOLS_PRIVATE_EXTERN = YES
-GCC_INLINES_ARE_PRIVATE_EXTERN = YES
-GCC_REUSE_STRINGS = YES
-
-// CPP11_NO_LIBCXX is used to gate some C++11 features that require that we
-// switch to libc++. We haven't switched to libc++11 because we have been unable
-// to find a clean way to build libcef_dll_wrapper with libc++.
-// We currently build libcef for Steam which needs to run on 10.5, and Xcode
-// does not support linking with libc++ and targeting 10.5.
-// Once libcef_dll_wrapper has been built with libc++, and you rebuild protobuf
-// with libc++ (which is trivial), you can remove CPP11_NO_LIBCXX and add the
-// 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
-
-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
-
-// CLANG - and use the ccache wrapper
-GCC_VERSION = com.apple.compilers.llvm.clang.1_0
-CC = $(SOURCE_ROOT)/devtools/bin/osx32/xcode_ccache_wrapper
-LDPLUSPLUS = $(DT_TOOLCHAIN_DIR)/usr/bin/clang++
-CLANG_WARN_CXX0X_EXTENSIONS = NO
-CLANG_CXX_LANGUAGE_STANDARD = gnu++11
-
-// include <memory.h> gets confused, 'cause ivp has one, and the system has one, and only one
-// gets into the header map, so sacrifice speed for corectness.
-USE_HEADERMAP = NO
-
-SDKROOT = macosx10.7
-MACOSX_DEPLOYMENT_TARGET = 10.5
-GCC_FAST_MATH = YES
+ALWAYS_SEARCH_USER_PATHS = YES +HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS) $(SDKROOT)/usr/include/malloc + +ARCHS = i386 +ONLY_ACTIVE_ARCH = NO +COPY_PHASE_STRIP = NO +DEBUG_INFORMATION_FORMAT = dwarf-with-dsym + +DEAD_CODE_STRIPPING = YES +PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES + +GCC_C_LANGUAGE_STANDARD = gnu99 +GCC_ENABLE_OBJC_EXCEPTIONS = YES +GCC_SYMBOLS_PRIVATE_EXTERN = YES +GCC_INLINES_ARE_PRIVATE_EXTERN = YES +GCC_REUSE_STRINGS = YES + +// CPP11_NO_LIBCXX is used to gate some C++11 features that require that we +// switch to libc++. We haven't switched to libc++11 because we have been unable +// to find a clean way to build libcef_dll_wrapper with libc++. +// We currently build libcef for Steam which needs to run on 10.5, and Xcode +// does not support linking with libc++ and targeting 10.5. +// Once libcef_dll_wrapper has been built with libc++, and you rebuild protobuf +// with libc++ (which is trivial), you can remove CPP11_NO_LIBCXX and add the +// 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 + +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 + +// CLANG - and use the ccache wrapper +GCC_VERSION = com.apple.compilers.llvm.clang.1_0 +CC = $(SOURCE_ROOT)/devtools/bin/osx32/xcode_ccache_wrapper +LDPLUSPLUS = $(DT_TOOLCHAIN_DIR)/usr/bin/clang++ +CLANG_WARN_CXX0X_EXTENSIONS = NO +CLANG_CXX_LANGUAGE_STANDARD = gnu++11 + +// include <memory.h> gets confused, 'cause ivp has one, and the system has one, and only one +// gets into the header map, so sacrifice speed for corectness. +USE_HEADERMAP = NO + +SDKROOT = macosx10.7 +MACOSX_DEPLOYMENT_TARGET = 10.5 +GCC_FAST_MATH = YES diff --git a/mp/src/devtools/debug.xcconfig b/mp/src/devtools/debug.xcconfig index 668a3cf1..4f63198a 100644 --- a/mp/src/devtools/debug.xcconfig +++ b/mp/src/devtools/debug.xcconfig @@ -1,4 +1,4 @@ -#include "base.xcconfig"
-GCC_OPTIMIZATION_LEVEL = 0
-OTHER_CFLAGS = $(derived) $(BASE_CFLAGS)
-
+#include "base.xcconfig" +GCC_OPTIMIZATION_LEVEL = 0 +OTHER_CFLAGS = $(derived) $(BASE_CFLAGS) + diff --git a/mp/src/devtools/release.xcconfig b/mp/src/devtools/release.xcconfig index 5e1a475f..1f1a24ef 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
+#include "base.xcconfig" + +GCC_OPTIMIZATION_LEVEL = 2 +OTHER_CFLAGS = $(derived) $(BASE_CFLAGS) -ftree-vectorize -fpredictive-commoning -funswitch-loops diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/DebugProject.xcconfig b/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/DebugProject.xcconfig index eb0bf501..3d68157d 100644 --- a/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/DebugProject.xcconfig +++ b/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/DebugProject.xcconfig @@ -1,30 +1,30 @@ -//
-// DebugProject.xcconfig
-//
-// These are Debug Configuration project settings for the gtest framework and
-// examples. It is set in the "Based On:" dropdown in the "Project" info
-// dialog.
-// This file is based on the Xcode Configuration files in:
-// http://code.google.com/p/google-toolbox-for-mac/
-//
-
-#include "General.xcconfig"
-
-// No optimization
-GCC_OPTIMIZATION_LEVEL = 0
-
-// Deployment postprocessing is what triggers Xcode to strip, turn it off
-DEPLOYMENT_POSTPROCESSING = NO
-
-// Dead code stripping off
-DEAD_CODE_STRIPPING = NO
-
-// Debug symbols should be on obviously
-GCC_GENERATE_DEBUGGING_SYMBOLS = YES
-
-// Define the DEBUG macro in all debug builds
-OTHER_CFLAGS = $(OTHER_CFLAGS) -DDEBUG=1
-
-// These are turned off to avoid STL incompatibilities with client code
-// // Turns on special C++ STL checks to "encourage" good STL use
-// GCC_PREPROCESSOR_DEFINITIONS = $(GCC_PREPROCESSOR_DEFINITIONS) _GLIBCXX_DEBUG_PEDANTIC _GLIBCXX_DEBUG _GLIBCPP_CONCEPT_CHECKS
+// +// DebugProject.xcconfig +// +// These are Debug Configuration project settings for the gtest framework and +// examples. It is set in the "Based On:" dropdown in the "Project" info +// dialog. +// This file is based on the Xcode Configuration files in: +// http://code.google.com/p/google-toolbox-for-mac/ +// + +#include "General.xcconfig" + +// No optimization +GCC_OPTIMIZATION_LEVEL = 0 + +// Deployment postprocessing is what triggers Xcode to strip, turn it off +DEPLOYMENT_POSTPROCESSING = NO + +// Dead code stripping off +DEAD_CODE_STRIPPING = NO + +// Debug symbols should be on obviously +GCC_GENERATE_DEBUGGING_SYMBOLS = YES + +// Define the DEBUG macro in all debug builds +OTHER_CFLAGS = $(OTHER_CFLAGS) -DDEBUG=1 + +// These are turned off to avoid STL incompatibilities with client code +// // Turns on special C++ STL checks to "encourage" good STL use +// GCC_PREPROCESSOR_DEFINITIONS = $(GCC_PREPROCESSOR_DEFINITIONS) _GLIBCXX_DEBUG_PEDANTIC _GLIBCXX_DEBUG _GLIBCPP_CONCEPT_CHECKS diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/FrameworkTarget.xcconfig b/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/FrameworkTarget.xcconfig index 42811b47..357b1c8f 100644 --- a/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/FrameworkTarget.xcconfig +++ b/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/FrameworkTarget.xcconfig @@ -1,17 +1,17 @@ -//
-// FrameworkTarget.xcconfig
-//
-// These are Framework target settings for the gtest framework and examples. It
-// is set in the "Based On:" dropdown in the "Target" info dialog.
-// This file is based on the Xcode Configuration files in:
-// http://code.google.com/p/google-toolbox-for-mac/
-//
-
-// Dynamic libs need to be position independent
-GCC_DYNAMIC_NO_PIC = NO
-
-// Dynamic libs should not have their external symbols stripped.
-STRIP_STYLE = non-global
-
-// Let the user install by specifying the $DSTROOT with xcodebuild
-SKIP_INSTALL = NO
+// +// FrameworkTarget.xcconfig +// +// These are Framework target settings for the gtest framework and examples. It +// is set in the "Based On:" dropdown in the "Target" info dialog. +// This file is based on the Xcode Configuration files in: +// http://code.google.com/p/google-toolbox-for-mac/ +// + +// Dynamic libs need to be position independent +GCC_DYNAMIC_NO_PIC = NO + +// Dynamic libs should not have their external symbols stripped. +STRIP_STYLE = non-global + +// Let the user install by specifying the $DSTROOT with xcodebuild +SKIP_INSTALL = NO diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/General.xcconfig b/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/General.xcconfig index 15224767..9fcada16 100644 --- a/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/General.xcconfig +++ b/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/General.xcconfig @@ -1,41 +1,41 @@ -//
-// General.xcconfig
-//
-// These are General configuration settings for the gtest framework and
-// examples.
-// This file is based on the Xcode Configuration files in:
-// http://code.google.com/p/google-toolbox-for-mac/
-//
-
-// Build for PPC and Intel, 32- and 64-bit
-ARCHS = i386 x86_64 ppc ppc64
-
-// Zerolink prevents link warnings so turn it off
-ZERO_LINK = NO
-
-// Prebinding considered unhelpful in 10.3 and later
-PREBINDING = NO
-
-// Strictest warning policy
-WARNING_CFLAGS = -Wall -Werror -Wendif-labels -Wnewline-eof -Wno-sign-compare
-
-// Work around Xcode bugs by using external strip. See:
-// http://lists.apple.com/archives/Xcode-users/2006/Feb/msg00050.html
-SEPARATE_STRIP = YES
-
-// Force C99 dialect
-GCC_C_LANGUAGE_STANDARD = c99
-
-// not sure why apple defaults this on, but it's pretty risky
-ALWAYS_SEARCH_USER_PATHS = NO
-
-// Turn on position dependent code for most cases (overridden where appropriate)
-GCC_DYNAMIC_NO_PIC = YES
-
-// Default SDK and minimum OS version is 10.4
-SDKROOT = $(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk
-MACOSX_DEPLOYMENT_TARGET = 10.4
-GCC_VERSION = 4.0
-
-// VERSIONING BUILD SETTINGS (used in Info.plist)
-GTEST_VERSIONINFO_ABOUT = © 2008 Google Inc.
+// +// General.xcconfig +// +// These are General configuration settings for the gtest framework and +// examples. +// This file is based on the Xcode Configuration files in: +// http://code.google.com/p/google-toolbox-for-mac/ +// + +// Build for PPC and Intel, 32- and 64-bit +ARCHS = i386 x86_64 ppc ppc64 + +// Zerolink prevents link warnings so turn it off +ZERO_LINK = NO + +// Prebinding considered unhelpful in 10.3 and later +PREBINDING = NO + +// Strictest warning policy +WARNING_CFLAGS = -Wall -Werror -Wendif-labels -Wnewline-eof -Wno-sign-compare + +// Work around Xcode bugs by using external strip. See: +// http://lists.apple.com/archives/Xcode-users/2006/Feb/msg00050.html +SEPARATE_STRIP = YES + +// Force C99 dialect +GCC_C_LANGUAGE_STANDARD = c99 + +// not sure why apple defaults this on, but it's pretty risky +ALWAYS_SEARCH_USER_PATHS = NO + +// Turn on position dependent code for most cases (overridden where appropriate) +GCC_DYNAMIC_NO_PIC = YES + +// Default SDK and minimum OS version is 10.4 +SDKROOT = $(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk +MACOSX_DEPLOYMENT_TARGET = 10.4 +GCC_VERSION = 4.0 + +// VERSIONING BUILD SETTINGS (used in Info.plist) +GTEST_VERSIONINFO_ABOUT = © 2008 Google Inc. diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/ReleaseProject.xcconfig b/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/ReleaseProject.xcconfig index 6c8d12e3..5349f0a0 100644 --- a/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/ReleaseProject.xcconfig +++ b/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/ReleaseProject.xcconfig @@ -1,32 +1,32 @@ -//
-// ReleaseProject.xcconfig
-//
-// These are Release Configuration project settings for the gtest framework
-// and examples. It is set in the "Based On:" dropdown in the "Project" info
-// dialog.
-// This file is based on the Xcode Configuration files in:
-// http://code.google.com/p/google-toolbox-for-mac/
-//
-
-#include "General.xcconfig"
-
-// subconfig/Release.xcconfig
-
-// Optimize for space and size (Apple recommendation)
-GCC_OPTIMIZATION_LEVEL = s
-
-// Deploment postprocessing is what triggers Xcode to strip
-DEPLOYMENT_POSTPROCESSING = YES
-
-// No symbols
-GCC_GENERATE_DEBUGGING_SYMBOLS = NO
-
-// Dead code strip does not affect ObjC code but can help for C
-DEAD_CODE_STRIPPING = YES
-
-// NDEBUG is used by things like assert.h, so define it for general compat.
-// ASSERT going away in release tends to create unused vars.
-OTHER_CFLAGS = $(OTHER_CFLAGS) -DNDEBUG=1 -Wno-unused-variable
-
-// When we strip we want to strip all symbols in release, but save externals.
-STRIP_STYLE = all
+// +// ReleaseProject.xcconfig +// +// These are Release Configuration project settings for the gtest framework +// and examples. It is set in the "Based On:" dropdown in the "Project" info +// dialog. +// This file is based on the Xcode Configuration files in: +// http://code.google.com/p/google-toolbox-for-mac/ +// + +#include "General.xcconfig" + +// subconfig/Release.xcconfig + +// Optimize for space and size (Apple recommendation) +GCC_OPTIMIZATION_LEVEL = s + +// Deploment postprocessing is what triggers Xcode to strip +DEPLOYMENT_POSTPROCESSING = YES + +// No symbols +GCC_GENERATE_DEBUGGING_SYMBOLS = NO + +// Dead code strip does not affect ObjC code but can help for C +DEAD_CODE_STRIPPING = YES + +// NDEBUG is used by things like assert.h, so define it for general compat. +// ASSERT going away in release tends to create unused vars. +OTHER_CFLAGS = $(OTHER_CFLAGS) -DNDEBUG=1 -Wno-unused-variable + +// When we strip we want to strip all symbols in release, but save externals. +STRIP_STYLE = all diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/StaticLibraryTarget.xcconfig b/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/StaticLibraryTarget.xcconfig index f69e1c2e..3922fa51 100644 --- a/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/StaticLibraryTarget.xcconfig +++ b/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/StaticLibraryTarget.xcconfig @@ -1,18 +1,18 @@ -//
-// StaticLibraryTarget.xcconfig
-//
-// These are static library target settings for libgtest.a. It
-// is set in the "Based On:" dropdown in the "Target" info dialog.
-// This file is based on the Xcode Configuration files in:
-// http://code.google.com/p/google-toolbox-for-mac/
-//
-
-// Static libs can be included in bundles so make them position independent
-GCC_DYNAMIC_NO_PIC = NO
-
-// Static libs should not have their internal globals or external symbols
-// stripped.
-STRIP_STYLE = debugging
-
-// Let the user install by specifying the $DSTROOT with xcodebuild
-SKIP_INSTALL = NO
+// +// StaticLibraryTarget.xcconfig +// +// These are static library target settings for libgtest.a. It +// is set in the "Based On:" dropdown in the "Target" info dialog. +// This file is based on the Xcode Configuration files in: +// http://code.google.com/p/google-toolbox-for-mac/ +// + +// Static libs can be included in bundles so make them position independent +GCC_DYNAMIC_NO_PIC = NO + +// Static libs should not have their internal globals or external symbols +// stripped. +STRIP_STYLE = debugging + +// Let the user install by specifying the $DSTROOT with xcodebuild +SKIP_INSTALL = NO diff --git a/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/TestTarget.xcconfig b/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/TestTarget.xcconfig index 9dd13aeb..e6652ba8 100644 --- a/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/TestTarget.xcconfig +++ b/mp/src/thirdparty/protobuf-2.3.0/gtest/xcode/Config/TestTarget.xcconfig @@ -1,8 +1,8 @@ -//
-// TestTarget.xcconfig
-//
-// These are Test target settings for the gtest framework and examples. It
-// is set in the "Based On:" dropdown in the "Target" info dialog.
-
-PRODUCT_NAME = $(TARGET_NAME)
-HEADER_SEARCH_PATHS = ../include
+// +// TestTarget.xcconfig +// +// These are Test target settings for the gtest framework and examples. It +// is set in the "Based On:" dropdown in the "Target" info dialog. + +PRODUCT_NAME = $(TARGET_NAME) +HEADER_SEARCH_PATHS = ../include |