diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-07-05 01:32:50 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-07-05 01:32:50 +0000 |
| commit | ee1a4b9bc8db6fdc49f24855becd9eb00cd61ed4 (patch) | |
| tree | 2be2aaab22f3f715b6c6f1a8ccbe04949b021717 /macosx/plugins | |
| parent | 98d7380ec7887a091c62d9d860815c70b0edffe8 (diff) | |
| download | pcsxr-ee1a4b9bc8db6fdc49f24855becd9eb00cd61ed4.tar.gz | |
Implement the Xcode setting files on Xcode projects.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85827 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/plugins')
7 files changed, 141 insertions, 269 deletions
diff --git a/macosx/plugins/Bladesio1/Bladesio1.xcodeproj/project.pbxproj b/macosx/plugins/Bladesio1/Bladesio1.xcodeproj/project.pbxproj index 956daf4e..eb27672b 100644 --- a/macosx/plugins/Bladesio1/Bladesio1.xcodeproj/project.pbxproj +++ b/macosx/plugins/Bladesio1/Bladesio1.xcodeproj/project.pbxproj @@ -41,6 +41,10 @@ 55858D0F178609A80068B8FC /* sio1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sio1.c; sourceTree = "<group>"; }; 55858D10178609A80068B8FC /* sio1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sio1.h; sourceTree = "<group>"; }; 55858D11178609A80068B8FC /* typedefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = typedefs.h; sourceTree = "<group>"; }; + 55858D301786531D0068B8FC /* Pcsxr-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Pcsxr-Debug.xcconfig"; path = "../../Pcsxr-Debug.xcconfig"; sourceTree = "<group>"; }; + 55858D311786531D0068B8FC /* Pcsxr-Instrument.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Pcsxr-Instrument.xcconfig"; path = "../../Pcsxr-Instrument.xcconfig"; sourceTree = "<group>"; }; + 55858D321786531D0068B8FC /* Pcsxr-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Pcsxr-Release.xcconfig"; path = "../../Pcsxr-Release.xcconfig"; sourceTree = "<group>"; }; + 55858D331786531D0068B8FC /* Pcsxr.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file; name = Pcsxr.xcconfig; path = ../../Pcsxr.xcconfig; sourceTree = "<group>"; }; 5586006D1785137C00CB3D85 /* ARCBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ARCBridge.h; sourceTree = "<group>"; }; 71F3C32511F3CD0B007B9F12 /* cfg.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; path = cfg.c; sourceTree = "<group>"; }; 71F3C32611F3CD0B007B9F12 /* PluginConfigController.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = PluginConfigController.h; sourceTree = "<group>"; }; @@ -97,6 +101,7 @@ 8D576317048677EA00EA77CD /* Info.plist */, 8D5B49A704867FD3000E48DA /* InfoPlist.strings */, 552E4CBC1474737A00FB231F /* Localizable.strings */, + 55858D3D178653A80068B8FC /* Configs */, ); name = Resources; sourceTree = "<group>"; @@ -118,6 +123,17 @@ name = Products; sourceTree = "<group>"; }; + 55858D3D178653A80068B8FC /* Configs */ = { + isa = PBXGroup; + children = ( + 55858D301786531D0068B8FC /* Pcsxr-Debug.xcconfig */, + 55858D311786531D0068B8FC /* Pcsxr-Instrument.xcconfig */, + 55858D321786531D0068B8FC /* Pcsxr-Release.xcconfig */, + 55858D331786531D0068B8FC /* Pcsxr.xcconfig */, + ); + name = Configs; + sourceTree = "<group>"; + }; 71F3C30911F3CC22007B9F12 /* src */ = { isa = PBXGroup; children = ( @@ -288,12 +304,7 @@ 7107359A0FDEED75004AD098 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - "CLANG_ENABLE_OBJC_ARC[arch=x86_64]" = YES; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "PCSXRPLUG=Bladesio1", "$(inherited)", @@ -312,14 +323,9 @@ 7107359B0FDEED75004AD098 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - "CLANG_ENABLE_OBJC_ARC[arch=x86_64]" = YES; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = YES; GCC_DYNAMIC_NO_PIC = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_OPTIMIZATION_LEVEL = s; GCC_PREPROCESSOR_DEFINITIONS = ( - "PCSXRPLUG=DFCdrom", + "PCSXRPLUG=Bladesio1", "$(inherited)", ); GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; @@ -335,20 +341,12 @@ }; 7107359F0FDEED75004AD098 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 55858D301786531D0068B8FC /* Pcsxr-Debug.xcconfig */; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEBUG_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "_MACOSX=1", - "$(DEBUG_PREPROCESSOR_DEFINITIONS)", - ); - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; @@ -358,29 +356,17 @@ ../../../plugins/dfcdrom, ); MACOSX_DEPLOYMENT_TARGET = 10.7; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - STRIP_INSTALLED_PRODUCT = NO; - VALID_ARCHS = "i386 x86_64"; }; name = Debug; }; 710735A00FDEED75004AD098 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 55858D321786531D0068B8FC /* Pcsxr-Release.xcconfig */; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEBUG_PREPROCESSOR_DEFINITIONS = ""; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_PREPROCESSOR_DEFINITIONS = ( - "_MACOSX=1", - "$(DEBUG_PREPROCESSOR_DEFINITIONS)", - ); - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; @@ -390,8 +376,6 @@ ../../../plugins/dfcdrom, ); MACOSX_DEPLOYMENT_TARGET = 10.7; - SDKROOT = macosx; - VALID_ARCHS = "i386 x86_64"; }; name = Release; }; diff --git a/macosx/plugins/DFCdrom/DFCdrom.xcodeproj/project.pbxproj b/macosx/plugins/DFCdrom/DFCdrom.xcodeproj/project.pbxproj index 8a48676b..bf3af058 100644 --- a/macosx/plugins/DFCdrom/DFCdrom.xcodeproj/project.pbxproj +++ b/macosx/plugins/DFCdrom/DFCdrom.xcodeproj/project.pbxproj @@ -31,6 +31,10 @@ 28586CC514651E870082B8EC /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/DFCdromPluginConfig.xib; sourceTree = "<group>"; }; 2BD707170555997500CB5D9B /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; }; 552E4CBB1474737A00FB231F /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = "<group>"; }; + 55858D56178657110068B8FC /* Pcsxr-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Pcsxr-Debug.xcconfig"; path = "../../Pcsxr-Debug.xcconfig"; sourceTree = "<group>"; }; + 55858D57178657110068B8FC /* Pcsxr-Instrument.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Pcsxr-Instrument.xcconfig"; path = "../../Pcsxr-Instrument.xcconfig"; sourceTree = "<group>"; }; + 55858D58178657110068B8FC /* Pcsxr-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Pcsxr-Release.xcconfig"; path = "../../Pcsxr-Release.xcconfig"; sourceTree = "<group>"; }; + 55858D59178657110068B8FC /* Pcsxr.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file; name = Pcsxr.xcconfig; path = ../../Pcsxr.xcconfig; sourceTree = "<group>"; }; 5586006D1785137C00CB3D85 /* ARCBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ARCBridge.h; sourceTree = "<group>"; }; 713DB2E311F113C30001BDD4 /* cdr.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; lineEnding = 2; name = cdr.c; path = ../../../plugins/dfcdrom/cdr.c; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.c; }; 713DB2E411F113C30001BDD4 /* cdr.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = cdr.h; path = ../../../plugins/dfcdrom/cdr.h; sourceTree = SOURCE_ROOT; }; @@ -86,6 +90,7 @@ 089C167CFE841241C02AAC07 /* Resources */ = { isa = PBXGroup; children = ( + 55858D5A178657110068B8FC /* Configs */, 28586CC414651E870082B8EC /* DFCdromPluginConfig.xib */, 71F3C47811F3D108007B9F12 /* Credits.rtf */, 8D576317048677EA00EA77CD /* Info.plist */, @@ -112,6 +117,18 @@ name = Products; sourceTree = "<group>"; }; + 55858D5A178657110068B8FC /* Configs */ = { + isa = PBXGroup; + children = ( + 55858D56178657110068B8FC /* Pcsxr-Debug.xcconfig */, + 55858D57178657110068B8FC /* Pcsxr-Instrument.xcconfig */, + 55858D58178657110068B8FC /* Pcsxr-Release.xcconfig */, + 55858D59178657110068B8FC /* Pcsxr.xcconfig */, + ); + name = Configs; + path = "/Users/cwbetts/makestuff/PCSX-R/macosx/plugins/DFSound/Resorces/../../Bladesio1"; + sourceTree = "<absolute>"; + }; 71F3C30911F3CC22007B9F12 /* src */ = { isa = PBXGroup; children = ( @@ -322,20 +339,12 @@ }; 7107359F0FDEED75004AD098 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 55858D56178657110068B8FC /* Pcsxr-Debug.xcconfig */; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEBUG_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "_MACOSX=1", - "$(DEBUG_PREPROCESSOR_DEFINITIONS)", - ); - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; @@ -344,30 +353,17 @@ ../.., ../../../plugins/dfcdrom, ); - MACOSX_DEPLOYMENT_TARGET = 10.6; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - STRIP_INSTALLED_PRODUCT = NO; - VALID_ARCHS = "i386 x86_64"; }; name = Debug; }; 710735A00FDEED75004AD098 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 55858D58178657110068B8FC /* Pcsxr-Release.xcconfig */; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEBUG_PREPROCESSOR_DEFINITIONS = ""; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_PREPROCESSOR_DEFINITIONS = ( - "_MACOSX=1", - "$(DEBUG_PREPROCESSOR_DEFINITIONS)", - ); - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; @@ -376,9 +372,6 @@ ../.., ../../../plugins/dfcdrom, ); - MACOSX_DEPLOYMENT_TARGET = 10.6; - SDKROOT = macosx; - VALID_ARCHS = "i386 x86_64"; }; name = Release; }; diff --git a/macosx/plugins/DFInput/DFInput.xcodeproj/project.pbxproj b/macosx/plugins/DFInput/DFInput.xcodeproj/project.pbxproj index 96b2b3bf..e17d6b1f 100644 --- a/macosx/plugins/DFInput/DFInput.xcodeproj/project.pbxproj +++ b/macosx/plugins/DFInput/DFInput.xcodeproj/project.pbxproj @@ -77,6 +77,10 @@ 2B679860069193F300E2BD4F /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; }; 2B679861069193F300E2BD4F /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; }; 552E4CC01474739200FB231F /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = "<group>"; }; + 55858D5B1786579E0068B8FC /* Pcsxr-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Pcsxr-Debug.xcconfig"; path = "../../Pcsxr-Debug.xcconfig"; sourceTree = "<group>"; }; + 55858D5C1786579E0068B8FC /* Pcsxr-Instrument.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Pcsxr-Instrument.xcconfig"; path = "../../Pcsxr-Instrument.xcconfig"; sourceTree = "<group>"; }; + 55858D5D1786579E0068B8FC /* Pcsxr-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Pcsxr-Release.xcconfig"; path = "../../Pcsxr-Release.xcconfig"; sourceTree = "<group>"; }; + 55858D5E1786579E0068B8FC /* Pcsxr.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file; name = Pcsxr.xcconfig; path = ../../Pcsxr.xcconfig; sourceTree = "<group>"; }; 5586006F1785138600CB3D85 /* ARCBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ARCBridge.h; sourceTree = "<group>"; }; 71054E201204A49F00AC2CCB /* ForceFeedback.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ForceFeedback.framework; path = /System/Library/Frameworks/ForceFeedback.framework; sourceTree = "<absolute>"; }; 7136F51912011BB4001973D9 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = "<group>"; }; @@ -180,6 +184,7 @@ 089C167CFE841241C02AAC07 /* Resources */ = { isa = PBXGroup; children = ( + 55858D5F1786579E0068B8FC /* Configs */, 7136F51812011BB4001973D9 /* Credits.rtf */, 28586CC114651E730082B8EC /* NetPcsxrHIDInputPluginMain.xib */, 8D576317048677EA00EA77CD /* Info.plist */, @@ -197,6 +202,18 @@ name = Products; sourceTree = "<group>"; }; + 55858D5F1786579E0068B8FC /* Configs */ = { + isa = PBXGroup; + children = ( + 55858D5B1786579E0068B8FC /* Pcsxr-Debug.xcconfig */, + 55858D5C1786579E0068B8FC /* Pcsxr-Instrument.xcconfig */, + 55858D5D1786579E0068B8FC /* Pcsxr-Release.xcconfig */, + 55858D5E1786579E0068B8FC /* Pcsxr.xcconfig */, + ); + name = Configs; + path = "/Users/cwbetts/makestuff/PCSX-R/macosx/plugins/DFSound/Resorces/../../Bladesio1"; + sourceTree = "<absolute>"; + }; 714FA82811FC820900517F47 /* src */ = { isa = PBXGroup; children = ( @@ -528,12 +545,8 @@ 71155B0D0FDFA2DE00EC0BC5 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - "CLANG_ENABLE_OBJC_ARC[arch=x86_64]" = YES; COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "PCSXRPLUG=DFInput", @@ -557,12 +570,8 @@ 71155B0E0FDFA2DE00EC0BC5 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - "CLANG_ENABLE_OBJC_ARC[arch=x86_64]" = YES; COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = YES; GCC_DYNAMIC_NO_PIC = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_OPTIMIZATION_LEVEL = s; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "PCSXRPLUG=DFInput", @@ -585,20 +594,12 @@ }; 71155B120FDFA2DE00EC0BC5 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 55858D5B1786579E0068B8FC /* Pcsxr-Debug.xcconfig */; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEBUG_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "_MACOSX=1", - "$(DEBUG_PREPROCESSOR_DEFINITIONS)", - ); - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; @@ -610,31 +611,17 @@ ../../../../plugins/dfinput, ../Common/SDL/include, ); - MACOSX_DEPLOYMENT_TARGET = 10.6; - ONLY_ACTIVE_ARCH = YES; - OTHER_CFLAGS = ""; - SDKROOT = macosx; - STRIP_INSTALLED_PRODUCT = NO; - VALID_ARCHS = "i386 x86_64"; }; name = Debug; }; 71155B130FDFA2DE00EC0BC5 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 55858D5D1786579E0068B8FC /* Pcsxr-Release.xcconfig */; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEBUG_PREPROCESSOR_DEFINITIONS = ""; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_PREPROCESSOR_DEFINITIONS = ( - "_MACOSX=1", - "$(DEBUG_PREPROCESSOR_DEFINITIONS)", - ); - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; @@ -646,10 +633,6 @@ ../../../../plugins/dfinput, ../Common/SDL/include, ); - MACOSX_DEPLOYMENT_TARGET = 10.6; - OTHER_CFLAGS = ""; - SDKROOT = macosx; - VALID_ARCHS = "i386 x86_64"; }; name = Release; }; diff --git a/macosx/plugins/DFNet/DFNet.xcodeproj/project.pbxproj b/macosx/plugins/DFNet/DFNet.xcodeproj/project.pbxproj index 3e0d4984..514c941e 100755 --- a/macosx/plugins/DFNet/DFNet.xcodeproj/project.pbxproj +++ b/macosx/plugins/DFNet/DFNet.xcodeproj/project.pbxproj @@ -34,6 +34,10 @@ 55278DBB12C813AC00288CD8 /* dfnet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dfnet.h; path = ../../../plugins/dfnet/dfnet.h; sourceTree = SOURCE_ROOT; }; 55278DBC12C813AC00288CD8 /* unix.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 2; name = unix.c; path = ../../../plugins/dfnet/unix.c; sourceTree = SOURCE_ROOT; }; 55278DC112C8141600288CD8 /* cfg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cfg.c; sourceTree = "<group>"; }; + 55858D65178658810068B8FC /* Pcsxr-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Pcsxr-Debug.xcconfig"; path = "../../Pcsxr-Debug.xcconfig"; sourceTree = "<group>"; }; + 55858D66178658810068B8FC /* Pcsxr-Instrument.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Pcsxr-Instrument.xcconfig"; path = "../../Pcsxr-Instrument.xcconfig"; sourceTree = "<group>"; }; + 55858D67178658810068B8FC /* Pcsxr-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Pcsxr-Release.xcconfig"; path = "../../Pcsxr-Release.xcconfig"; sourceTree = "<group>"; }; + 55858D68178658810068B8FC /* Pcsxr.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file; name = Pcsxr.xcconfig; path = ../../Pcsxr.xcconfig; sourceTree = "<group>"; }; 558600721785139C00CB3D85 /* ARCBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ARCBridge.h; sourceTree = "<group>"; }; 559DACB2146C64B800C5DF71 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = plugins/DFNet/English.lproj/DFNet.xib; sourceTree = "<group>"; }; 559DACB7146C64D600C5DF71 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = plugins/DFNet/English.lproj/SockDialog.xib; sourceTree = "<group>"; }; @@ -84,6 +88,7 @@ 089C167CFE841241C02AAC07 /* Resources */ = { isa = PBXGroup; children = ( + 55858D69178658810068B8FC /* Configs */, 559DACB1146C64B800C5DF71 /* DFNet.xib */, 71F3C47811F3D108007B9F12 /* Credits.rtf */, 8D576317048677EA00EA77CD /* Info.plist */, @@ -111,6 +116,18 @@ name = Products; sourceTree = "<group>"; }; + 55858D69178658810068B8FC /* Configs */ = { + isa = PBXGroup; + children = ( + 55858D65178658810068B8FC /* Pcsxr-Debug.xcconfig */, + 55858D66178658810068B8FC /* Pcsxr-Instrument.xcconfig */, + 55858D67178658810068B8FC /* Pcsxr-Release.xcconfig */, + 55858D68178658810068B8FC /* Pcsxr.xcconfig */, + ); + name = Configs; + path = "/Users/cwbetts/makestuff/PCSX-R/macosx/plugins/DFSound/Resorces/../../Bladesio1"; + sourceTree = "<absolute>"; + }; 71F3C30911F3CC22007B9F12 /* src */ = { isa = PBXGroup; children = ( @@ -288,10 +305,6 @@ isa = XCBuildConfiguration; buildSettings = { COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "PCSXRPLUG=DFNet", @@ -302,7 +315,6 @@ INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins"; PRODUCT_NAME = "$(TARGET_NAME)"; - SYMROOT = ../../build; WRAPPER_EXTENSION = psxplugin; }; name = Debug; @@ -311,10 +323,6 @@ isa = XCBuildConfiguration; buildSettings = { COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = YES; - GCC_DYNAMIC_NO_PIC = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_OPTIMIZATION_LEVEL = s; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "PCSXRPLUG=DFNet", @@ -325,53 +333,31 @@ INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins"; PRODUCT_NAME = "$(TARGET_NAME)"; - SYMROOT = ../../build; WRAPPER_EXTENSION = psxplugin; }; name = Release; }; 7107359F0FDEED75004AD098 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 55858D65178658810068B8FC /* Pcsxr-Debug.xcconfig */; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - "CLANG_ENABLE_OBJC_ARC[arch=x86_64]" = YES; - DEBUG_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "_MACOSX=1", - "$(DEBUG_PREPROCESSOR_DEFINITIONS)", - ); HEADER_SEARCH_PATHS = ( ../../../libpcsxcore, ../.., ../../../plugins/dfnet, ); - MACOSX_DEPLOYMENT_TARGET = 10.6; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - STRIP_INSTALLED_PRODUCT = NO; - VALID_ARCHS = "i386 x86_64"; }; name = Debug; }; 710735A00FDEED75004AD098 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 55858D67178658810068B8FC /* Pcsxr-Release.xcconfig */; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - "CLANG_ENABLE_OBJC_ARC[arch=x86_64]" = YES; - DEBUG_PREPROCESSOR_DEFINITIONS = ""; - GCC_PREPROCESSOR_DEFINITIONS = ( - "_MACOSX=1", - "$(DEBUG_PREPROCESSOR_DEFINITIONS)", - ); HEADER_SEARCH_PATHS = ( ../../../libpcsxcore, ../.., ../../../plugins/dfnet, ); - MACOSX_DEPLOYMENT_TARGET = 10.6; - SDKROOT = macosx; - VALID_ARCHS = "i386 x86_64"; }; name = Release; }; diff --git a/macosx/plugins/DFSound/PeopsSPU.xcodeproj/project.pbxproj b/macosx/plugins/DFSound/PeopsSPU.xcodeproj/project.pbxproj index 6da05601..3e1d831c 100644 --- a/macosx/plugins/DFSound/PeopsSPU.xcodeproj/project.pbxproj +++ b/macosx/plugins/DFSound/PeopsSPU.xcodeproj/project.pbxproj @@ -130,6 +130,10 @@ 5545886F1783E5FE008A7407 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/NetSfPeopsSpuPluginMain.xib; sourceTree = "<group>"; }; 554588761783F2E3008A7407 /* SPUPluginController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUPluginController.h; sourceTree = "<group>"; }; 554588771783F2E3008A7407 /* SPUPluginController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUPluginController.m; sourceTree = "<group>"; }; + 55858D3E178654D90068B8FC /* Pcsxr-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Pcsxr-Debug.xcconfig"; path = "../../Pcsxr-Debug.xcconfig"; sourceTree = "<group>"; }; + 55858D3F178654D90068B8FC /* Pcsxr-Instrument.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Pcsxr-Instrument.xcconfig"; path = "../../Pcsxr-Instrument.xcconfig"; sourceTree = "<group>"; }; + 55858D40178654D90068B8FC /* Pcsxr-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Pcsxr-Release.xcconfig"; path = "../../Pcsxr-Release.xcconfig"; sourceTree = "<group>"; }; + 55858D41178654D90068B8FC /* Pcsxr.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file; name = Pcsxr.xcconfig; path = ../../Pcsxr.xcconfig; sourceTree = "<group>"; }; 5586006A1785136A00CB3D85 /* ARCBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ARCBridge.h; sourceTree = "<group>"; }; 5599692713AFCCC600B0216B /* openal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = openal.c; sourceTree = "<group>"; }; 5599695E13AFCD2900B0216B /* PeopsSpuAL.psxplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PeopsSpuAL.psxplugin; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -276,6 +280,7 @@ 089C167CFE841241C02AAC07 /* Resources */ = { isa = PBXGroup; children = ( + 55858D42178654D90068B8FC /* Configs */, 554588691783E5FE008A7407 /* Shared */, 5506635714AB91C100C7C565 /* OpenAL */, 5506636014AB91C100C7C565 /* SDL */, @@ -386,6 +391,18 @@ path = Shared; sourceTree = "<group>"; }; + 55858D42178654D90068B8FC /* Configs */ = { + isa = PBXGroup; + children = ( + 55858D3E178654D90068B8FC /* Pcsxr-Debug.xcconfig */, + 55858D3F178654D90068B8FC /* Pcsxr-Instrument.xcconfig */, + 55858D40178654D90068B8FC /* Pcsxr-Release.xcconfig */, + 55858D41178654D90068B8FC /* Pcsxr.xcconfig */, + ); + name = Configs; + path = ../../Bladesio1; + sourceTree = "<group>"; + }; 71C7B1C0130F340E004BF975 /* SDL */ = { isa = PBXGroup; children = ( @@ -748,15 +765,11 @@ CLANG_CXX_LIBRARY = "libc++"; "CLANG_ENABLE_OBJC_ARC[arch=x86_64]" = YES; CLANG_WARN_EMPTY_BODY = YES; - COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; EXECUTABLE_PREFIX = lib; GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; INSTALL_PATH = "@rpath"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -771,13 +784,11 @@ CLANG_CXX_LIBRARY = "libc++"; "CLANG_ENABLE_OBJC_ARC[arch=x86_64]" = YES; CLANG_WARN_EMPTY_BODY = YES; - COPY_PHASE_STRIP = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; EXECUTABLE_PREFIX = lib; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; INSTALL_PATH = "@rpath"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -787,11 +798,6 @@ 5599695C13AFCD2900B0216B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "PCSXRPLUG=ALSound", USEOPENAL, @@ -812,10 +818,6 @@ 5599695D13AFCD2900B0216B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_OPTIMIZATION_LEVEL = s; GCC_PREPROCESSOR_DEFINITIONS = ( "PCSXRPLUG=ALSound", USEOPENAL, @@ -836,11 +838,6 @@ 71155B270FDFA2EB00EC0BC5 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "PCSXRPLUG=SDLSound", USESDL, @@ -863,10 +860,6 @@ 71155B290FDFA2EB00EC0BC5 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_OPTIMIZATION_LEVEL = s; GCC_PREPROCESSOR_DEFINITIONS = ( "PCSXRPLUG=SDLSound", USESDL, @@ -888,54 +881,29 @@ }; 71155B2C0FDFA2EB00EC0BC5 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 55858D3E178654D90068B8FC /* Pcsxr-Debug.xcconfig */; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - "CLANG_ENABLE_OBJC_ARC[arch=x86_64]" = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEBUG_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "_MACOSX=1", - "$(DEBUG_PREPROCESSOR_DEFINITIONS)", - ); - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.6; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - VALID_ARCHS = "i386 x86_64"; }; name = Debug; }; 71155B2E0FDFA2EB00EC0BC5 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 55858D40178654D90068B8FC /* Pcsxr-Release.xcconfig */; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - "CLANG_ENABLE_OBJC_ARC[arch=x86_64]" = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEBUG_PREPROCESSOR_DEFINITIONS = ""; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_PREPROCESSOR_DEFINITIONS = ( - "_MACOSX=1", - "$(DEBUG_PREPROCESSOR_DEFINITIONS)", - ); - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.6; - SDKROOT = macosx; - VALID_ARCHS = "i386 x86_64"; }; name = Release; }; diff --git a/macosx/plugins/DFXVideo/PeopsSoftGPU.xcodeproj/project.pbxproj b/macosx/plugins/DFXVideo/PeopsSoftGPU.xcodeproj/project.pbxproj index 17abfd7e..93a6b7bd 100644 --- a/macosx/plugins/DFXVideo/PeopsSoftGPU.xcodeproj/project.pbxproj +++ b/macosx/plugins/DFXVideo/PeopsSoftGPU.xcodeproj/project.pbxproj @@ -53,6 +53,10 @@ 5555E0C21606839300C0A310 /* gpuPeteOGL2.slf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = gpuPeteOGL2.slf; sourceTree = "<group>"; }; 5555E0C31606839300C0A310 /* gpuPeteOGL2.slv */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = gpuPeteOGL2.slv; sourceTree = "<group>"; }; 5555E0CA160695BF00C0A310 /* SGPUPreferences.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SGPUPreferences.h; path = macsrc/SGPUPreferences.h; sourceTree = "<group>"; }; + 55858D4F178656240068B8FC /* Pcsxr-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Pcsxr-Debug.xcconfig"; path = "../../Pcsxr-Debug.xcconfig"; sourceTree = "<group>"; }; + 55858D50178656240068B8FC /* Pcsxr-Instrument.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Pcsxr-Instrument.xcconfig"; path = "../../Pcsxr-Instrument.xcconfig"; sourceTree = "<group>"; }; + 55858D51178656240068B8FC /* Pcsxr-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Pcsxr-Release.xcconfig"; path = "../../Pcsxr-Release.xcconfig"; sourceTree = "<group>"; }; + 55858D52178656240068B8FC /* Pcsxr.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file; name = Pcsxr.xcconfig; path = ../../Pcsxr.xcconfig; sourceTree = "<group>"; }; 5586006017850E5800CB3D85 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; 5586006217850E6C00CB3D85 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; }; 5586006317850E6C00CB3D85 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; @@ -146,6 +150,7 @@ 2BD2E818077AFB9F00657C69 /* Resources */ = { isa = PBXGroup; children = ( + 55858D53178656240068B8FC /* Configs */, 5555E0C21606839300C0A310 /* gpuPeteOGL2.slf */, 5555E0C31606839300C0A310 /* gpuPeteOGL2.slv */, 28586CC714651E9B0082B8EC /* NetSfPeopsSoftGPUConfig.xib */, @@ -157,6 +162,18 @@ name = Resources; sourceTree = "<group>"; }; + 55858D53178656240068B8FC /* Configs */ = { + isa = PBXGroup; + children = ( + 55858D4F178656240068B8FC /* Pcsxr-Debug.xcconfig */, + 55858D50178656240068B8FC /* Pcsxr-Instrument.xcconfig */, + 55858D51178656240068B8FC /* Pcsxr-Release.xcconfig */, + 55858D52178656240068B8FC /* Pcsxr.xcconfig */, + ); + name = Configs; + path = "/Users/cwbetts/makestuff/PCSX-R/macosx/plugins/DFSound/Resorces/../../Bladesio1"; + sourceTree = "<absolute>"; + }; 5586006817850E8800CB3D85 /* Additional Frameworks */ = { isa = PBXGroup; children = ( @@ -318,26 +335,16 @@ 7170842D0FDFD328004F3EB4 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - "CLANG_ENABLE_OBJC_ARC[arch=x86_64]" = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 1; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = ""; - GCC_PREPROCESSOR_DEFINITIONS = ( - "PCSXRPLUG=SoftGL", - _MACGL, - _DARWIN, - "$(inherited)", - ); - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins"; OPTIMIZATION_CFLAGS = "-finline-functions -finline-limit=1600 -fno-exceptions -funroll-loops -falign-loops=16 -ffast-math"; - OTHER_CFLAGS = "-finline-functions"; + OTHER_CFLAGS = ( + "$(inherited)", + "$(OPTIMIZATION_CFLAGS)", + ); PRODUCT_NAME = "$(TARGET_NAME)"; SECTORDER_FLAGS = ""; WRAPPER_EXTENSION = psxplugin; @@ -347,25 +354,16 @@ 7170842E0FDFD328004F3EB4 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - "CLANG_ENABLE_OBJC_ARC[arch=x86_64]" = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; - GCC_DYNAMIC_NO_PIC = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_OPTIMIZATION_LEVEL = 3; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = ""; - GCC_PREPROCESSOR_DEFINITIONS = ( - "PCSXRPLUG=SoftGL", - _MACGL, - _DARWIN, - "$(inherited)", - ); - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins"; OPTIMIZATION_CFLAGS = "-finline-functions -finline-limit=1600 -fomit-frame-pointer -fno-exceptions -funroll-loops -falign-loops=16 -ffast-math"; + OTHER_CFLAGS = ( + "$(inherited)", + "$(OPTIMIZATION_CFLAGS)", + ); PRODUCT_NAME = "$(TARGET_NAME)"; SECTORDER_FLAGS = ""; WRAPPER_EXTENSION = psxplugin; @@ -374,20 +372,12 @@ }; 717084320FDFD328004F3EB4 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 55858D4F178656240068B8FC /* Pcsxr-Debug.xcconfig */; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEBUG_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "_MACOSX=1", - "$(DEBUG_PREPROCESSOR_DEFINITIONS)", - ); - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; @@ -395,29 +385,17 @@ ../../../plugins/dfxvideo, ../../../libpcsxcore, ); - MACOSX_DEPLOYMENT_TARGET = 10.6; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - VALID_ARCHS = "i386 x86_64"; }; name = Debug; }; 717084330FDFD328004F3EB4 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 55858D51178656240068B8FC /* Pcsxr-Release.xcconfig */; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEBUG_PREPROCESSOR_DEFINITIONS = ""; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_PREPROCESSOR_DEFINITIONS = ( - "_MACOSX=1", - "$(DEBUG_PREPROCESSOR_DEFINITIONS)", - ); - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; @@ -425,9 +403,6 @@ ../../../plugins/dfxvideo, ../../../libpcsxcore, ); - MACOSX_DEPLOYMENT_TARGET = 10.6; - SDKROOT = macosx; - VALID_ARCHS = "i386 x86_64"; }; name = Release; }; diff --git a/macosx/plugins/PeopsXgl/PeopsXGL.xcodeproj/project.pbxproj b/macosx/plugins/PeopsXgl/PeopsXGL.xcodeproj/project.pbxproj index 37cf76c0..e788daa1 100644 --- a/macosx/plugins/PeopsXgl/PeopsXGL.xcodeproj/project.pbxproj +++ b/macosx/plugins/PeopsXgl/PeopsXGL.xcodeproj/project.pbxproj @@ -68,6 +68,10 @@ 3F7F384613079BFD00556C34 /* draw.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = draw.h; path = ../../../plugins/peopsxgl/draw.h; sourceTree = SOURCE_ROOT; }; 3F7F384713079BFD00556C34 /* draw.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; lineEnding = 2; name = draw.c; path = ../../../plugins/peopsxgl/draw.c; sourceTree = SOURCE_ROOT; }; 552E4CCA1474742F00FB231F /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = "<group>"; }; + 55858D60178657F70068B8FC /* Pcsxr-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Pcsxr-Debug.xcconfig"; path = "../../Pcsxr-Debug.xcconfig"; sourceTree = "<group>"; }; + 55858D61178657F70068B8FC /* Pcsxr-Instrument.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Pcsxr-Instrument.xcconfig"; path = "../../Pcsxr-Instrument.xcconfig"; sourceTree = "<group>"; }; + 55858D62178657F70068B8FC /* Pcsxr-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Pcsxr-Release.xcconfig"; path = "../../Pcsxr-Release.xcconfig"; sourceTree = "<group>"; }; + 55858D63178657F70068B8FC /* Pcsxr.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file; name = Pcsxr.xcconfig; path = ../../Pcsxr.xcconfig; sourceTree = "<group>"; }; 558600711785139200CB3D85 /* ARCBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ARCBridge.h; sourceTree = "<group>"; }; 55D42F10168D9AAE0027EBF0 /* ExtendedKeys.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ExtendedKeys.h; path = macsrc/ExtendedKeys.h; sourceTree = "<group>"; }; 55F36E4A146C9F9900718DE6 /* drawgl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = drawgl.h; path = macsrc/drawgl.h; sourceTree = "<group>"; }; @@ -139,6 +143,7 @@ 2BD2E818077AFB9F00657C69 /* Resources */ = { isa = PBXGroup; children = ( + 55858D64178657F70068B8FC /* Configs */, 28586CBC14651D960082B8EC /* NetSfPeopsOpenGLConfig.xib */, 28586CBF14651E560082B8EC /* NetSfPeopsOpenGLGPUInterface.xib */, 2BD2E767077AF53E00657C69 /* Credits.rtf */, @@ -148,6 +153,18 @@ name = Resources; sourceTree = "<group>"; }; + 55858D64178657F70068B8FC /* Configs */ = { + isa = PBXGroup; + children = ( + 55858D60178657F70068B8FC /* Pcsxr-Debug.xcconfig */, + 55858D61178657F70068B8FC /* Pcsxr-Instrument.xcconfig */, + 55858D62178657F70068B8FC /* Pcsxr-Release.xcconfig */, + 55858D63178657F70068B8FC /* Pcsxr.xcconfig */, + ); + name = Configs; + path = "/Users/cwbetts/makestuff/PCSX-R/macosx/plugins/DFSound/Resorces/../../Bladesio1"; + sourceTree = "<absolute>"; + }; 71E9EBF0109F24B600E98D1D /* src */ = { isa = PBXGroup; children = ( @@ -303,12 +320,7 @@ 7170842D0FDFD328004F3EB4 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - "CLANG_ENABLE_OBJC_ARC[arch=x86_64]" = YES; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "PCSXRPLUG=PeopsXGL", @@ -337,12 +349,7 @@ 7170842E0FDFD328004F3EB4 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - "CLANG_ENABLE_OBJC_ARC[arch=x86_64]" = YES; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = YES; GCC_DYNAMIC_NO_PIC = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_OPTIMIZATION_LEVEL = 3; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "PCSXRPLUG=PeopsXGL", @@ -369,20 +376,12 @@ }; 717084320FDFD328004F3EB4 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 55858D60178657F70068B8FC /* Pcsxr-Debug.xcconfig */; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEBUG_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "_MACOSX=1", - "$(DEBUG_PREPROCESSOR_DEFINITIONS)", - ); - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; @@ -391,33 +390,20 @@ ../../../plugins/peopsxgl, ../../../libpcsxcore, ); - MACOSX_DEPLOYMENT_TARGET = 10.6; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - VALID_ARCHS = "i386 x86_64"; WARNING_CFLAGS = "-Wall"; }; name = Debug; }; 717084330FDFD328004F3EB4 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 55858D62178657F70068B8FC /* Pcsxr-Release.xcconfig */; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEBUG_PREPROCESSOR_DEFINITIONS = ""; GCC_ENABLE_SSE3_EXTENSIONS = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_OPTIMIZATION_LEVEL = 3; - GCC_PREPROCESSOR_DEFINITIONS = ( - "_MACOSX=1", - "$(DEBUG_PREPROCESSOR_DEFINITIONS)", - ); - GCC_UNROLL_LOOPS = YES; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; @@ -426,10 +412,7 @@ ../../../plugins/peopsxgl, ../../../libpcsxcore, ); - MACOSX_DEPLOYMENT_TARGET = 10.6; OTHER_CFLAGS = "-fomit-frame-pointer"; - SDKROOT = macosx; - VALID_ARCHS = "i386 x86_64"; WARNING_CFLAGS = "-Wall"; }; name = Release; |
