Get rid of the messy preprocessor hack for named sliders on the audio plug-ins for OS X:

Consolidate files that are the same.
Whatever class loads a nib, will be that owner, no matter what the nib says.
Have shared code be in a dylib that loads, so there isn't warnings about conflicting classes.
Other changes

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85757 e17a0e51-4ae3-4d35-97c3-1a29b211df97

1 files changed, 250 insertions, 67 deletions

diff --git a/macosx/plugins/DFSound/PeopsSPU.xcodeproj/project.pbxproj b/macosx/plugins/DFSound/PeopsSPU.xcodeproj/project.pbxproj
index 3886f1ff..0cf94129 100644
--- a/macosx/plugins/DFSound/PeopsSPU.xcodeproj/project.pbxproj
+++ b/macosx/plugins/DFSound/PeopsSPU.xcodeproj/project.pbxproj
@@ -9,18 +9,25 @@
 /* Begin PBXBuildFile section */
 		2B7B2B94072D9BE6007F0C35 /* PluginController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B7B2B92072D9BE6007F0C35 /* PluginController.m */; };
 		2B7B2BD1072DAE5D007F0C35 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B7B2BD0072DAE5D007F0C35 /* AppKit.framework */; };
-		2B7B2BE9072DB1B6007F0C35 /* NamedSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B7B2BE7072DB1B6007F0C35 /* NamedSlider.m */; };
 		2BFF7F3E0715D2E00061278A /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BFF7F3D0715D2E00061278A /* Carbon.framework */; };
-		5506636A14AB91C100C7C565 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 5506635814AB91C100C7C565 /* Credits.rtf */; };
 		5506636C14AB91C100C7C565 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5506635A14AB91C100C7C565 /* InfoPlist.strings */; };
-		5506636E14AB91C100C7C565 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5506635C14AB91C100C7C565 /* Localizable.strings */; };
-		5506637114AB91C100C7C565 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 5506636114AB91C100C7C565 /* Credits.rtf */; };
 		5506637314AB91C100C7C565 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5506636314AB91C100C7C565 /* InfoPlist.strings */; };
-		5506637514AB91C100C7C565 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5506636514AB91C100C7C565 /* Localizable.strings */; };
-		5506637714AB91C100C7C565 /* NetSfPeopsSpuSDLPluginMain.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5506636714AB91C100C7C565 /* NetSfPeopsSpuSDLPluginMain.xib */; };
-		5506639A14AB9E0300C7C565 /* NetSfPeopsSpuALPluginMain.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5506639814AB9E0300C7C565 /* NetSfPeopsSpuALPluginMain.xib */; };
+		554588461783DF39008A7407 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 554588451783DF39008A7407 /* Cocoa.framework */; };
+		554588541783DF87008A7407 /* NamedSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B7B2BE7072DB1B6007F0C35 /* NamedSlider.m */; };
+		554588551783DF8B008A7407 /* NamedSlider.h in Headers */ = {isa = PBXBuildFile; fileRef = 2B7B2BE6072DB1B6007F0C35 /* NamedSlider.h */; };
+		554588581783DFE0008A7407 /* libSPUSharedCode.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 554588431783DF39008A7407 /* libSPUSharedCode.dylib */; };
+		5545885A1783DFFE008A7407 /* libSPUSharedCode.dylib in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 554588431783DF39008A7407 /* libSPUSharedCode.dylib */; };
+		5545885D1783E00E008A7407 /* libSPUSharedCode.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 554588431783DF39008A7407 /* libSPUSharedCode.dylib */; };
+		5545885F1783E020008A7407 /* libSPUSharedCode.dylib in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 554588431783DF39008A7407 /* libSPUSharedCode.dylib */; };
+		554588701783E5FE008A7407 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 5545886A1783E5FE008A7407 /* Credits.rtf */; };
+		554588711783E5FE008A7407 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 5545886A1783E5FE008A7407 /* Credits.rtf */; };
+		554588721783E5FE008A7407 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5545886C1783E5FE008A7407 /* Localizable.strings */; };
+		554588731783E5FE008A7407 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5545886C1783E5FE008A7407 /* Localizable.strings */; };
+		554588741783E5FE008A7407 /* NetSfPeopsSpuPluginMain.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5545886E1783E5FE008A7407 /* NetSfPeopsSpuPluginMain.xib */; };
+		554588751783E5FE008A7407 /* NetSfPeopsSpuPluginMain.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5545886E1783E5FE008A7407 /* NetSfPeopsSpuPluginMain.xib */; };
+		554588781783F2E3008A7407 /* SPUPluginController.h in Headers */ = {isa = PBXBuildFile; fileRef = 554588761783F2E3008A7407 /* SPUPluginController.h */; };
+		554588791783F2E3008A7407 /* SPUPluginController.m in Sources */ = {isa = PBXBuildFile; fileRef = 554588771783F2E3008A7407 /* SPUPluginController.m */; };
 		5599693C13AFCD2900B0216B /* PluginController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B7B2B92072D9BE6007F0C35 /* PluginController.m */; };
-		5599693D13AFCD2900B0216B /* NamedSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B7B2BE7072DB1B6007F0C35 /* NamedSlider.m */; };
 		5599693E13AFCD2900B0216B /* dma.c in Sources */ = {isa = PBXBuildFile; fileRef = 71E4E797109DC529003BB7AC /* dma.c */; };
 		5599693F13AFCD2900B0216B /* freeze.c in Sources */ = {isa = PBXBuildFile; fileRef = 71E4E79B109DC529003BB7AC /* freeze.c */; };
 		5599694013AFCD2900B0216B /* registers.c in Sources */ = {isa = PBXBuildFile; fileRef = 71E4E79F109DC529003BB7AC /* registers.c */; };
@@ -59,23 +66,69 @@
 		A1A2073E13816B1D005EE84C /* externals.c in Sources */ = {isa = PBXBuildFile; fileRef = A1A2073D13816B1D005EE84C /* externals.c */; };
 /* End PBXBuildFile section */
 
+/* Begin PBXContainerItemProxy section */
+		554588561783DFD9008A7407 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 089C1669FE841209C02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 554588421783DF39008A7407;
+			remoteInfo = PCSXRNamedSliders;
+		};
+		5545885B1783E00A008A7407 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 089C1669FE841209C02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 554588421783DF39008A7407;
+			remoteInfo = PCSXRNamedSliders;
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		554588591783DFE6008A7407 /* Copy Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				5545885A1783DFFE008A7407 /* libSPUSharedCode.dylib in Copy Frameworks */,
+			);
+			name = "Copy Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		5545885E1783E015008A7407 /* Copy Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				5545885F1783E020008A7407 /* libSPUSharedCode.dylib in Copy Frameworks */,
+			);
+			name = "Copy Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
 /* Begin PBXFileReference section */
 		0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
-		2B7B2B91072D9BE6007F0C35 /* PluginController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PluginController.h; sourceTree = "<group>"; };
-		2B7B2B92072D9BE6007F0C35 /* PluginController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PluginController.m; sourceTree = "<group>"; };
+		2B7B2B91072D9BE6007F0C35 /* PluginController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = PluginController.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+		2B7B2B92072D9BE6007F0C35 /* PluginController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = PluginController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
 		2B7B2BD0072DAE5D007F0C35 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
 		2B7B2BE6072DB1B6007F0C35 /* NamedSlider.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = NamedSlider.h; sourceTree = "<group>"; };
 		2B7B2BE7072DB1B6007F0C35 /* NamedSlider.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = NamedSlider.m; sourceTree = "<group>"; };
 		2BFF7F3D0715D2E00061278A /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
-		5506635914AB91C100C7C565 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = "<group>"; };
 		5506635B14AB91C100C7C565 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		5506635D14AB91C100C7C565 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = "<group>"; };
-		5506636214AB91C100C7C565 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = "<group>"; };
 		5506636414AB91C100C7C565 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		5506636614AB91C100C7C565 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = "<group>"; };
-		5506636814AB91C100C7C565 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/NetSfPeopsSpuSDLPluginMain.xib; sourceTree = "<group>"; };
-		5506639914AB9E0300C7C565 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/NetSfPeopsSpuALPluginMain.xib; sourceTree = "<group>"; };
 		5517C065136217DE00706CCF /* externals.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = externals.c; sourceTree = "<group>"; };
+		554588431783DF39008A7407 /* libSPUSharedCode.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libSPUSharedCode.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		554588451783DF39008A7407 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
+		554588481783DF39008A7407 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
+		554588491783DF39008A7407 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
+		5545884A1783DF39008A7407 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+		5545886B1783E5FE008A7407 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = "<group>"; };
+		5545886D1783E5FE008A7407 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = "<group>"; };
+		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>"; };
 		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; };
 		5599696E13AFCE1D00B0216B /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; };
@@ -152,10 +205,19 @@
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
+		554588401783DF39008A7407 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				554588461783DF39008A7407 /* Cocoa.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		5599695413AFCD2900B0216B /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				5545885D1783E00E008A7407 /* libSPUSharedCode.dylib in Frameworks */,
 				5599695513AFCD2900B0216B /* CoreFoundation.framework in Frameworks */,
 				5599695713AFCD2900B0216B /* AppKit.framework in Frameworks */,
 				5599696F13AFCE1D00B0216B /* OpenAL.framework in Frameworks */,
@@ -166,6 +228,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				554588581783DFE0008A7407 /* libSPUSharedCode.dylib in Frameworks */,
 				8D576314048677EA00EA77CD /* CoreFoundation.framework in Frameworks */,
 				2BFF7F3E0715D2E00061278A /* Carbon.framework in Frameworks */,
 				2B7B2BD1072DAE5D007F0C35 /* AppKit.framework in Frameworks */,
@@ -186,6 +249,7 @@
 				089C167CFE841241C02AAC07 /* Resources */,
 				71C7B1C0130F340E004BF975 /* SDL */,
 				089C1671FE841209C02AAC07 /* External Frameworks and Libraries */,
+				554588441783DF39008A7407 /* Frameworks */,
 				19C28FB6FE9D52B211CA2CBB /* Products */,
 				8D576317048677EA00EA77CD /* Info-SDL.plist */,
 				55C8AB0C146DCD0E005ACCCB /* Info-AL.plist */,
@@ -210,6 +274,7 @@
 		089C167CFE841241C02AAC07 /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				554588691783E5FE008A7407 /* Shared */,
 				5506635714AB91C100C7C565 /* OpenAL */,
 				5506636014AB91C100C7C565 /* SDL */,
 			);
@@ -254,6 +319,7 @@
 			children = (
 				8D576316048677EA00EA77CD /* PeopsSpuSDL.psxplugin */,
 				5599695E13AFCD2900B0216B /* PeopsSpuAL.psxplugin */,
+				554588431783DF39008A7407 /* libSPUSharedCode.dylib */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -266,6 +332,8 @@
 				2B7B2B92072D9BE6007F0C35 /* PluginController.m */,
 				2B7B2BE6072DB1B6007F0C35 /* NamedSlider.h */,
 				2B7B2BE7072DB1B6007F0C35 /* NamedSlider.m */,
+				554588761783F2E3008A7407 /* SPUPluginController.h */,
+				554588771783F2E3008A7407 /* SPUPluginController.m */,
 			);
 			path = macsrc;
 			sourceTree = "<group>";
@@ -273,10 +341,7 @@
 		5506635714AB91C100C7C565 /* OpenAL */ = {
 			isa = PBXGroup;
 			children = (
-				5506635814AB91C100C7C565 /* Credits.rtf */,
 				5506635A14AB91C100C7C565 /* InfoPlist.strings */,
-				5506635C14AB91C100C7C565 /* Localizable.strings */,
-				5506639814AB9E0300C7C565 /* NetSfPeopsSpuALPluginMain.xib */,
 			);
 			path = OpenAL;
 			sourceTree = "<group>";
@@ -284,14 +349,40 @@
 		5506636014AB91C100C7C565 /* SDL */ = {
 			isa = PBXGroup;
 			children = (
-				5506636114AB91C100C7C565 /* Credits.rtf */,
 				5506636314AB91C100C7C565 /* InfoPlist.strings */,
-				5506636514AB91C100C7C565 /* Localizable.strings */,
-				5506636714AB91C100C7C565 /* NetSfPeopsSpuSDLPluginMain.xib */,
 			);
 			path = SDL;
 			sourceTree = "<group>";
 		};
+		554588441783DF39008A7407 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				554588451783DF39008A7407 /* Cocoa.framework */,
+				554588471783DF39008A7407 /* Other Frameworks */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		554588471783DF39008A7407 /* Other Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				554588481783DF39008A7407 /* AppKit.framework */,
+				554588491783DF39008A7407 /* CoreData.framework */,
+				5545884A1783DF39008A7407 /* Foundation.framework */,
+			);
+			name = "Other Frameworks";
+			sourceTree = "<group>";
+		};
+		554588691783E5FE008A7407 /* Shared */ = {
+			isa = PBXGroup;
+			children = (
+				5545886A1783E5FE008A7407 /* Credits.rtf */,
+				5545886C1783E5FE008A7407 /* Localizable.strings */,
+				5545886E1783E5FE008A7407 /* NetSfPeopsSpuPluginMain.xib */,
+			);
+			path = Shared;
+			sourceTree = "<group>";
+		};
 		71C7B1C0130F340E004BF975 /* SDL */ = {
 			isa = PBXGroup;
 			children = (
@@ -407,7 +498,36 @@
 		};
 /* End PBXGroup section */
 
+/* Begin PBXHeadersBuildPhase section */
+		554588411783DF39008A7407 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				554588551783DF8B008A7407 /* NamedSlider.h in Headers */,
+				554588781783F2E3008A7407 /* SPUPluginController.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
 /* Begin PBXNativeTarget section */
+		554588421783DF39008A7407 /* SPUSharedCode */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 554588531783DF39008A7407 /* Build configuration list for PBXNativeTarget "SPUSharedCode" */;
+			buildPhases = (
+				5545883F1783DF39008A7407 /* Sources */,
+				554588401783DF39008A7407 /* Frameworks */,
+				554588411783DF39008A7407 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = SPUSharedCode;
+			productName = PCSXRNamedSliders;
+			productReference = 554588431783DF39008A7407 /* libSPUSharedCode.dylib */;
+			productType = "com.apple.product-type.library.dynamic";
+		};
 		5599693613AFCD2900B0216B /* PeopsSpuAL */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 5599695B13AFCD2900B0216B /* Build configuration list for PBXNativeTarget "PeopsSpuAL" */;
@@ -415,10 +535,12 @@
 				5599693713AFCD2900B0216B /* Resources */,
 				5599693B13AFCD2900B0216B /* Sources */,
 				5599695413AFCD2900B0216B /* Frameworks */,
+				5545885E1783E015008A7407 /* Copy Frameworks */,
 			);
 			buildRules = (
 			);
 			dependencies = (
+				5545885C1783E00A008A7407 /* PBXTargetDependency */,
 			);
 			name = PeopsSpuAL;
 			productInstallPath = "$(HOME)/Library/Bundles";
@@ -433,10 +555,12 @@
 				8D57630F048677EA00EA77CD /* Resources */,
 				8D576311048677EA00EA77CD /* Sources */,
 				8D576313048677EA00EA77CD /* Frameworks */,
+				554588591783DFE6008A7407 /* Copy Frameworks */,
 			);
 			buildRules = (
 			);
 			dependencies = (
+				554588571783DFD9008A7407 /* PBXTargetDependency */,
 			);
 			name = PeopsSpuSDL;
 			productInstallPath = "$(HOME)/Library/Bundles";
@@ -468,6 +592,7 @@
 			targets = (
 				8D57630D048677EA00EA77CD /* PeopsSpuSDL */,
 				5599693613AFCD2900B0216B /* PeopsSpuAL */,
+				554588421783DF39008A7407 /* SPUSharedCode */,
 			);
 		};
 /* End PBXProject section */
@@ -477,10 +602,10 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				5506636A14AB91C100C7C565 /* Credits.rtf in Resources */,
 				5506636C14AB91C100C7C565 /* InfoPlist.strings in Resources */,
-				5506636E14AB91C100C7C565 /* Localizable.strings in Resources */,
-				5506639A14AB9E0300C7C565 /* NetSfPeopsSpuALPluginMain.xib in Resources */,
+				554588711783E5FE008A7407 /* Credits.rtf in Resources */,
+				554588731783E5FE008A7407 /* Localizable.strings in Resources */,
+				554588751783E5FE008A7407 /* NetSfPeopsSpuPluginMain.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -488,22 +613,30 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				5506637114AB91C100C7C565 /* Credits.rtf in Resources */,
 				5506637314AB91C100C7C565 /* InfoPlist.strings in Resources */,
-				5506637514AB91C100C7C565 /* Localizable.strings in Resources */,
-				5506637714AB91C100C7C565 /* NetSfPeopsSpuSDLPluginMain.xib in Resources */,
+				554588701783E5FE008A7407 /* Credits.rtf in Resources */,
+				554588721783E5FE008A7407 /* Localizable.strings in Resources */,
+				554588741783E5FE008A7407 /* NetSfPeopsSpuPluginMain.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
+		5545883F1783DF39008A7407 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				554588541783DF87008A7407 /* NamedSlider.m in Sources */,
+				554588791783F2E3008A7407 /* SPUPluginController.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		5599693B13AFCD2900B0216B /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				5599693C13AFCD2900B0216B /* PluginController.m in Sources */,
-				5599693D13AFCD2900B0216B /* NamedSlider.m in Sources */,
 				5599693E13AFCD2900B0216B /* dma.c in Sources */,
 				5599693F13AFCD2900B0216B /* freeze.c in Sources */,
 				5599694013AFCD2900B0216B /* registers.c in Sources */,
@@ -519,7 +652,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				2B7B2B94072D9BE6007F0C35 /* PluginController.m in Sources */,
-				2B7B2BE9072DB1B6007F0C35 /* NamedSlider.m in Sources */,
 				71E4E7AB109DC529003BB7AC /* dma.c in Sources */,
 				71E4E7AC109DC529003BB7AC /* freeze.c in Sources */,
 				71E4E7AE109DC529003BB7AC /* registers.c in Sources */,
@@ -547,15 +679,20 @@
 		};
 /* End PBXSourcesBuildPhase section */
 
+/* Begin PBXTargetDependency section */
+		554588571783DFD9008A7407 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 554588421783DF39008A7407 /* SPUSharedCode */;
+			targetProxy = 554588561783DFD9008A7407 /* PBXContainerItemProxy */;
+		};
+		5545885C1783E00A008A7407 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 554588421783DF39008A7407 /* SPUSharedCode */;
+			targetProxy = 5545885B1783E00A008A7407 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
 /* Begin PBXVariantGroup section */
-		5506635814AB91C100C7C565 /* Credits.rtf */ = {
-			isa = PBXVariantGroup;
-			children = (
-				5506635914AB91C100C7C565 /* English */,
-			);
-			name = Credits.rtf;
-			sourceTree = "<group>";
-		};
 		5506635A14AB91C100C7C565 /* InfoPlist.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
@@ -564,22 +701,6 @@
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
 		};
-		5506635C14AB91C100C7C565 /* Localizable.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				5506635D14AB91C100C7C565 /* English */,
-			);
-			name = Localizable.strings;
-			sourceTree = "<group>";
-		};
-		5506636114AB91C100C7C565 /* Credits.rtf */ = {
-			isa = PBXVariantGroup;
-			children = (
-				5506636214AB91C100C7C565 /* English */,
-			);
-			name = Credits.rtf;
-			sourceTree = "<group>";
-		};
 		5506636314AB91C100C7C565 /* InfoPlist.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
@@ -588,33 +709,75 @@
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
 		};
-		5506636514AB91C100C7C565 /* Localizable.strings */ = {
+		5545886A1783E5FE008A7407 /* Credits.rtf */ = {
 			isa = PBXVariantGroup;
 			children = (
-				5506636614AB91C100C7C565 /* English */,
+				5545886B1783E5FE008A7407 /* English */,
 			);
-			name = Localizable.strings;
+			name = Credits.rtf;
 			sourceTree = "<group>";
 		};
-		5506636714AB91C100C7C565 /* NetSfPeopsSpuSDLPluginMain.xib */ = {
+		5545886C1783E5FE008A7407 /* Localizable.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
-				5506636814AB91C100C7C565 /* English */,
+				5545886D1783E5FE008A7407 /* English */,
 			);
-			name = NetSfPeopsSpuSDLPluginMain.xib;
+			name = Localizable.strings;
 			sourceTree = "<group>";
 		};
-		5506639814AB9E0300C7C565 /* NetSfPeopsSpuALPluginMain.xib */ = {
+		5545886E1783E5FE008A7407 /* NetSfPeopsSpuPluginMain.xib */ = {
 			isa = PBXVariantGroup;
 			children = (
-				5506639914AB9E0300C7C565 /* English */,
+				5545886F1783E5FE008A7407 /* English */,
 			);
-			name = NetSfPeopsSpuALPluginMain.xib;
+			name = NetSfPeopsSpuPluginMain.xib;
 			sourceTree = "<group>";
 		};
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
+		554588511783DF39008A7407 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				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)";
+			};
+			name = Debug;
+		};
+		554588521783DF39008A7407 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				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)";
+			};
+			name = Release;
+		};
 		5599695C13AFCD2900B0216B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -624,9 +787,10 @@
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
-					"PCSXRPLUG=ALsound",
+					"PCSXRPLUG=ALSound",
 					_MACOSX,
 					USEOPENAL,
+					"$(inherited)",
 				);
 				HEADER_SEARCH_PATHS = (
 					src/,
@@ -634,6 +798,7 @@
 				);
 				INFOPLIST_FILE = "Info-AL.plist";
 				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
 				PRODUCT_NAME = PeopsSpuAL;
 				SYMROOT = ../../build;
 				WRAPPER_EXTENSION = psxplugin;
@@ -648,9 +813,10 @@
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_OPTIMIZATION_LEVEL = s;
 				GCC_PREPROCESSOR_DEFINITIONS = (
-					"PCSXRPLUG=ALsound",
+					"PCSXRPLUG=ALSound",
 					_MACOSX,
 					USEOPENAL,
+					"$(inherited)",
 				);
 				HEADER_SEARCH_PATHS = (
 					src/,
@@ -658,6 +824,7 @@
 				);
 				INFOPLIST_FILE = "Info-AL.plist";
 				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
 				PRODUCT_NAME = PeopsSpuAL;
 				SYMROOT = ../../build;
 				WRAPPER_EXTENSION = psxplugin;
@@ -673,10 +840,11 @@
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
-					"PCSXRPLUG=SPUSound",
+					"PCSXRPLUG=SDLSound",
 					_MACOSX,
 					USESDL,
 					SDL_JOYSTICK_DISABLED,
+					"$(inherited)",
 				);
 				HEADER_SEARCH_PATHS = (
 					src/,
@@ -685,6 +853,8 @@
 				);
 				INFOPLIST_FILE = "Info-SDL.plist";
 				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
+				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = PeopsSpuSDL;
 				SYMROOT = ../../build;
 				WRAPPER_EXTENSION = psxplugin;
@@ -699,10 +869,11 @@
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_OPTIMIZATION_LEVEL = s;
 				GCC_PREPROCESSOR_DEFINITIONS = (
-					"PCSXRPLUG=SPUSound",
+					"PCSXRPLUG=SDLSound",
 					_MACOSX,
 					USESDL,
 					SDL_JOYSTICK_DISABLED,
+					"$(inherited)",
 				);
 				HEADER_SEARCH_PATHS = (
 					src/,
@@ -711,6 +882,8 @@
 				);
 				INFOPLIST_FILE = "Info-SDL.plist";
 				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
+				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = PeopsSpuSDL;
 				SYMROOT = ../../build;
 				WRAPPER_EXTENSION = psxplugin;
@@ -727,6 +900,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
@@ -763,6 +937,15 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
+		554588531783DF39008A7407 /* Build configuration list for PBXNativeTarget "SPUSharedCode" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				554588511783DF39008A7407 /* Debug */,
+				554588521783DF39008A7407 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		5599695B13AFCD2900B0216B /* Build configuration list for PBXNativeTarget "PeopsSpuAL" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (