Additional merging

This commit is contained in:
Hendrik Holtmann
2014-02-10 01:57:21 +01:00
parent 7383e0819e
commit 595fcd5957
4 changed files with 15 additions and 57 deletions

View File

@ -438,7 +438,7 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = CMD_TOOL;
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_VERSION = "";
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
@ -446,7 +446,7 @@
ONLY_ACTIVE_ARCH = NO;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
SDKROOT = macosx10.7;
SDKROOT = macosx10.9;
};
name = Debug;
};
@ -463,14 +463,14 @@
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_PREPROCESSOR_DEFINITIONS = CMD_TOOL;
GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_VERSION = "";
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
MACOSX_DEPLOYMENT_TARGET = 10.5;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
SDKROOT = macosx10.7;
SDKROOT = macosx10.9;
};
name = Release;
};
@ -489,7 +489,7 @@
GCC_MODEL_PPC64 = NO;
GCC_MODEL_TUNING = "";
GCC_OPTIMIZATION_LEVEL = 0;
GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_VERSION = "";
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
INFOPLIST_FILE = Info.plist;
@ -502,7 +502,7 @@
ONLY_ACTIVE_ARCH = NO;
PRODUCT_NAME = smcFanControl;
PROVISIONING_PROFILE = "";
SDKROOT = macosx10.7;
SDKROOT = macosx10.9;
WRAPPER_EXTENSION = app;
ZERO_LINK = YES;
};
@ -522,7 +522,7 @@
FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)\"";
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = "";
GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_VERSION = "";
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
INFOPLIST_FILE = Info.plist;
@ -535,7 +535,7 @@
ONLY_ACTIVE_ARCH = NO;
PRODUCT_NAME = smcFanControl;
PROVISIONING_PROFILE = "";
SDKROOT = macosx10.7;
SDKROOT = macosx10.9;
VALID_ARCHS = "i386 x86_64";
WRAPPER_EXTENSION = app;
};