summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-09-20 18:21:07 +0000
committerSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-09-20 18:21:07 +0000
commit2775cc6b0dbe3e496cf04929c4cc2bf4d1aceb16 (patch)
tree454c2eac1fc3129b6de26c5fac6e3874451fff51
parent9afc013393a4b914ced9469b9585fe819c867c38 (diff)
downloadpcsxr-2775cc6b0dbe3e496cf04929c4cc2bf4d1aceb16.tar.gz
Fiddling with the Xcode files.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@87253 e17a0e51-4ae3-4d35-97c3-1a29b211df97
-rw-r--r--macosx/Configs/Pcsxr-Instrument.xcconfig1
-rw-r--r--macosx/Configs/Pcsxr-Release.xcconfig1
-rw-r--r--macosx/Configs/Pcsxr.xcconfig6
-rw-r--r--macosx/Pcsxr.xcodeproj/project.pbxproj5
4 files changed, 6 insertions, 7 deletions
diff --git a/macosx/Configs/Pcsxr-Instrument.xcconfig b/macosx/Configs/Pcsxr-Instrument.xcconfig
index 4dc5367e..652c1f22 100644
--- a/macosx/Configs/Pcsxr-Instrument.xcconfig
+++ b/macosx/Configs/Pcsxr-Instrument.xcconfig
@@ -4,3 +4,4 @@ COPY_PHASE_STRIP = NO
OPTIMIZATION_CFLAGS = -finline-functions -fno-exceptions -funroll-loops -ffast-math
STRIP_INSTALLED_PRODUCT = NO
GCC_GENERATE_DEBUGGING_SYMBOLS = YES
+CODE_SIGN_IDENTITY =
diff --git a/macosx/Configs/Pcsxr-Release.xcconfig b/macosx/Configs/Pcsxr-Release.xcconfig
index 300d7182..54013af5 100644
--- a/macosx/Configs/Pcsxr-Release.xcconfig
+++ b/macosx/Configs/Pcsxr-Release.xcconfig
@@ -15,3 +15,4 @@ GENERATE_PKGINFO_FILE = YES
INFOPLIST_OUTPUT_FORMAT = binary
PLIST_FILE_OUTPUT_FORMAT = binary
STRINGS_FILE_OUTPUT_ENCODING = binary
+CODE_SIGN_IDENTITY = PCSX-R Developer
diff --git a/macosx/Configs/Pcsxr.xcconfig b/macosx/Configs/Pcsxr.xcconfig
index bd3e3445..16b198c2 100644
--- a/macosx/Configs/Pcsxr.xcconfig
+++ b/macosx/Configs/Pcsxr.xcconfig
@@ -6,15 +6,17 @@
//
//
-ARCHS = $(ARCHS_STANDARD_64_BIT)
+ARCHS = $(ARCHS_STANDARD)
SDKROOT = macosx
GCC_PREPROCESSOR_DEFINITIONS = _MACOSX=1 $(DEBUG_PREPROCESSOR_DEFINITIONS)
DEBUG_INFORMATION_FORMAT = dwarf-with-dsym
GCC_VERSION = com.apple.compilers.llvm.clang.1_0
MACOSX_DEPLOYMENT_TARGET = 10.7
-VALID_ARCHS = x86_64
CLANG_ENABLE_OBJC_ARC = YES
GCC_DYNAMIC_NO_PIC = NO
COMBINE_HIDPI_IMAGES = YES
INFOPLIST_FILE = plugins/$(TARGET_NAME)/Info.plist
PRODUCT_NAME = $(TARGET_NAME)
+GCC_C_LANGUAGE_STANDARD = gnu89
+CLANG_CXX_LANGUAGE_STANDARD = gnu++0x
+CLANG_CXX_LIBRARY = libc++
diff --git a/macosx/Pcsxr.xcodeproj/project.pbxproj b/macosx/Pcsxr.xcodeproj/project.pbxproj
index 6c6e1fde..bbb21a9b 100644
--- a/macosx/Pcsxr.xcodeproj/project.pbxproj
+++ b/macosx/Pcsxr.xcodeproj/project.pbxproj
@@ -2767,7 +2767,6 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_WARN_EMPTY_BODY = YES;
- CODE_SIGN_IDENTITY = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
EXECUTABLE_PREFIX = lib;
@@ -2910,7 +2909,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 55858D2B17864DC90068B8FC /* Pcsxr-Instrument.xcconfig */;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD)";
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
@@ -3227,7 +3225,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 55858D2A17864DC80068B8FC /* Pcsxr-Debug.xcconfig */;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD)";
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
@@ -3254,14 +3251,12 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 55858D2C17864DC90068B8FC /* Pcsxr-Release.xcconfig */;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD)";
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
- CODE_SIGN_IDENTITY = "PCSX-R Developer";
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
GCC_WARN_ABOUT_RETURN_TYPE = YES;