OS X: Copy over the QuickLook plug-in into the app.

Note that the QuickLook plug-in hasn’t been tested in any way, shape, or form.

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

4 files changed, 45 insertions, 30 deletions

diff --git a/macosx/Pcsxr.xcodeproj/project.pbxproj b/macosx/Pcsxr.xcodeproj/project.pbxproj
index 28d1cde0..bff36995 100644
--- a/macosx/Pcsxr.xcodeproj/project.pbxproj
+++ b/macosx/Pcsxr.xcodeproj/project.pbxproj
@@ -159,17 +159,18 @@
 		551A778117869EAE0052D185 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 551A753A17868BEB0052D185 /* InfoPlist.strings */; };
 		551A778217869EAE0052D185 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 551A753C17868BEB0052D185 /* Localizable.strings */; };
 		551A778317869EAE0052D185 /* SockDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = 551A753E17868BEB0052D185 /* SockDialog.xib */; };
-		551A779417869F610052D185 /* Bladesio1.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 551A75CE17868C4E0052D185 /* Bladesio1.psxplugin */; };
-		551A779517869F610052D185 /* DFCdrom.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 551A767A178690500052D185 /* DFCdrom.psxplugin */; };
-		551A779617869F610052D185 /* DFInput.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 551A768E1786919F0052D185 /* DFInput.psxplugin */; };
-		551A779717869F610052D185 /* PeopsSoftGPU.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 551A76BC178693FF0052D185 /* PeopsSoftGPU.psxplugin */; };
-		551A779817869F610052D185 /* PeopsSpuSDL.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 551A76E2178696BD0052D185 /* PeopsSpuSDL.psxplugin */; };
-		551A779917869F610052D185 /* PeopsSpuAL.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 551A771F178698C60052D185 /* PeopsSpuAL.psxplugin */; };
-		551A779A17869F610052D185 /* PeopsXGL.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 551A774F17869C280052D185 /* PeopsXGL.psxplugin */; };
-		551A779B17869F610052D185 /* DFNet.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 551A776D17869E430052D185 /* DFNet.psxplugin */; };
+		551A779417869F610052D185 /* Bladesio1.psxplugin in Copy Plug-Ins */ = {isa = PBXBuildFile; fileRef = 551A75CE17868C4E0052D185 /* Bladesio1.psxplugin */; };
+		551A779517869F610052D185 /* DFCdrom.psxplugin in Copy Plug-Ins */ = {isa = PBXBuildFile; fileRef = 551A767A178690500052D185 /* DFCdrom.psxplugin */; };
+		551A779617869F610052D185 /* DFInput.psxplugin in Copy Plug-Ins */ = {isa = PBXBuildFile; fileRef = 551A768E1786919F0052D185 /* DFInput.psxplugin */; };
+		551A779717869F610052D185 /* PeopsSoftGPU.psxplugin in Copy Plug-Ins */ = {isa = PBXBuildFile; fileRef = 551A76BC178693FF0052D185 /* PeopsSoftGPU.psxplugin */; };
+		551A779817869F610052D185 /* PeopsSpuSDL.psxplugin in Copy Plug-Ins */ = {isa = PBXBuildFile; fileRef = 551A76E2178696BD0052D185 /* PeopsSpuSDL.psxplugin */; };
+		551A779917869F610052D185 /* PeopsSpuAL.psxplugin in Copy Plug-Ins */ = {isa = PBXBuildFile; fileRef = 551A771F178698C60052D185 /* PeopsSpuAL.psxplugin */; };
+		551A779A17869F610052D185 /* PeopsXGL.psxplugin in Copy Plug-Ins */ = {isa = PBXBuildFile; fileRef = 551A774F17869C280052D185 /* PeopsXGL.psxplugin */; };
+		551A779B17869F610052D185 /* DFNet.psxplugin in Copy Plug-Ins */ = {isa = PBXBuildFile; fileRef = 551A776D17869E430052D185 /* DFNet.psxplugin */; };
 		551A779E17869FC70052D185 /* libSPUSharedCode.dylib in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 551A76E71786971B0052D185 /* libSPUSharedCode.dylib */; };
 		551A77A017869FED0052D185 /* libSPUSharedCode.dylib in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 551A76E71786971B0052D185 /* libSPUSharedCode.dylib */; };
 		551A77E71786A4DD0052D185 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 551A76AC178693C60052D185 /* Carbon.framework */; };
+		55202EBB18E73E4F00C631AA /* Pcsxr-QL.qlgenerator in Copy QuickLook Plug-In */ = {isa = PBXBuildFile; fileRef = 550E343718E6293D00A1AD21 /* Pcsxr-QL.qlgenerator */; };
 		55268A5A1876244E00A82269 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 551A74A317868B110052D185 /* Foundation.framework */; };
 		5529EA11169CBE3400BAA2A5 /* RecentItemsMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 5550D2721683C923006C56B5 /* RecentItemsMenu.m */; };
 		553FECEE18DF5A8300C7B007 /* AddPluginSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 553FECB818DF5A8300C7B007 /* AddPluginSheet.xib */; };
@@ -381,22 +382,33 @@
 			name = "Copy Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		71AD2DF010C3573400365243 /* Copy PlugIns */ = {
+		55202EBA18E73E3E00C631AA /* Copy QuickLook Plug-In */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = Contents/Library/QuickLook;
+			dstSubfolderSpec = 1;
+			files = (
+				55202EBB18E73E4F00C631AA /* Pcsxr-QL.qlgenerator in Copy QuickLook Plug-In */,
+			);
+			name = "Copy QuickLook Plug-In";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		71AD2DF010C3573400365243 /* Copy Plug-Ins */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = "";
 			dstSubfolderSpec = 13;
 			files = (
-				551A779417869F610052D185 /* Bladesio1.psxplugin in Copy PlugIns */,
-				551A779517869F610052D185 /* DFCdrom.psxplugin in Copy PlugIns */,
-				551A779617869F610052D185 /* DFInput.psxplugin in Copy PlugIns */,
-				551A779717869F610052D185 /* PeopsSoftGPU.psxplugin in Copy PlugIns */,
-				551A779817869F610052D185 /* PeopsSpuSDL.psxplugin in Copy PlugIns */,
-				551A779917869F610052D185 /* PeopsSpuAL.psxplugin in Copy PlugIns */,
-				551A779A17869F610052D185 /* PeopsXGL.psxplugin in Copy PlugIns */,
-				551A779B17869F610052D185 /* DFNet.psxplugin in Copy PlugIns */,
-			);
-			name = "Copy PlugIns";
+				551A779417869F610052D185 /* Bladesio1.psxplugin in Copy Plug-Ins */,
+				551A779517869F610052D185 /* DFCdrom.psxplugin in Copy Plug-Ins */,
+				551A779617869F610052D185 /* DFInput.psxplugin in Copy Plug-Ins */,
+				551A779717869F610052D185 /* PeopsSoftGPU.psxplugin in Copy Plug-Ins */,
+				551A779817869F610052D185 /* PeopsSpuSDL.psxplugin in Copy Plug-Ins */,
+				551A779917869F610052D185 /* PeopsSpuAL.psxplugin in Copy Plug-Ins */,
+				551A779A17869F610052D185 /* PeopsXGL.psxplugin in Copy Plug-Ins */,
+				551A779B17869F610052D185 /* DFNet.psxplugin in Copy Plug-Ins */,
+			);
+			name = "Copy Plug-Ins";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXCopyFilesBuildPhase section */
@@ -483,8 +495,8 @@
 		551A754617868BEC0052D185 /* SockDialog.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SockDialog.h; sourceTree = "<group>"; };
 		551A754717868BEC0052D185 /* SockDialog.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SockDialog.m; sourceTree = "<group>"; };
 		551A754817868BEC0052D185 /* version.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = version.plist; sourceTree = "<group>"; };
-		551A754A17868BEC0052D185 /* Info-AL.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-AL.plist"; path = "../../Info-AL.plist"; sourceTree = "<group>"; };
-		551A754B17868BEC0052D185 /* Info-SDL.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-SDL.plist"; path = "../../Info-SDL.plist"; sourceTree = "<group>"; };
+		551A754A17868BEC0052D185 /* Info-AL.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-AL.plist"; sourceTree = "<group>"; };
+		551A754B17868BEC0052D185 /* Info-SDL.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-SDL.plist"; sourceTree = "<group>"; };
 		551A754E17868BEC0052D185 /* maccfg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = maccfg.h; sourceTree = "<group>"; };
 		551A754F17868BEC0052D185 /* NamedSlider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = NamedSlider.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		551A755017868BEC0052D185 /* NamedSlider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NamedSlider.m; sourceTree = "<group>"; };
@@ -1755,7 +1767,8 @@
 				2BB3D6A205427FE200831ACB /* Resources */,
 				2BB3D6A805427FE200831ACB /* Sources */,
 				2BB3D6C505427FE200831ACB /* Frameworks */,
-				71AD2DF010C3573400365243 /* Copy PlugIns */,
+				71AD2DF010C3573400365243 /* Copy Plug-Ins */,
+				55202EBA18E73E3E00C631AA /* Copy QuickLook Plug-In */,
 				55F41A3317EF8CFF00605DF8 /* Strip Headers */,
 			);
 			buildRules = (
@@ -2173,7 +2186,7 @@
 		};
 		55F41A3317EF8CFF00605DF8 /* Strip Headers */ = {
 			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 12;
+			buildActionMask = 8;
 			files = (
 			);
 			inputPaths = (
@@ -2181,7 +2194,7 @@
 			name = "Strip Headers";
 			outputPaths = (
 			);
-			runOnlyForDeploymentPostprocessing = 0;
+			runOnlyForDeploymentPostprocessing = 1;
 			shellPath = /bin/sh;
 			shellScript = "# Remove all headers from copied frameworks\nfind \"${TARGET_BUILD_DIR}\"/\"${PRODUCT_NAME}\".${WRAPPER_EXTENSION} -name Headers -print0 | xargs -0 rm -rf\nfind \"${TARGET_BUILD_DIR}\"/\"${PRODUCT_NAME}\".${WRAPPER_EXTENSION} -name PrivateHeaders -print0 | xargs -0 rm -rf\n";
 		};
@@ -3104,7 +3117,7 @@
 					/Library/Frameworks/SDL2.framework/Headers,
 					"$(inherited)",
 				);
-				INFOPLIST_FILE = "plugins/DFSound/Info-SDL.plist";
+				INFOPLIST_FILE = "plugins/DFSound/Resources/SDL/Info-SDL.plist";
 				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
 				WRAPPER_EXTENSION = psxplugin;
@@ -3128,7 +3141,7 @@
 					/Library/Frameworks/SDL2.framework/Headers,
 					"$(inherited)",
 				);
-				INFOPLIST_FILE = "plugins/DFSound/Info-SDL.plist";
+				INFOPLIST_FILE = "plugins/DFSound/Resources/SDL/Info-SDL.plist";
 				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
 				WRAPPER_EXTENSION = psxplugin;
@@ -3199,7 +3212,7 @@
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				INFOPLIST_FILE = "plugins/DFSound/Info-AL.plist";
+				INFOPLIST_FILE = "plugins/DFSound/Resources/OpenAL/Info-AL.plist";
 				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
 				WRAPPER_EXTENSION = psxplugin;
@@ -3218,7 +3231,7 @@
 					"$(inherited)",
 				);
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				INFOPLIST_FILE = "plugins/DFSound/Info-AL.plist";
+				INFOPLIST_FILE = "plugins/DFSound/Resources/OpenAL/Info-AL.plist";
 				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
 				WRAPPER_EXTENSION = psxplugin;
@@ -3532,7 +3545,7 @@
 					/Library/Frameworks/SDL2.framework/Headers,
 					"$(inherited)",
 				);
-				INFOPLIST_FILE = "plugins/DFSound/Info-SDL.plist";
+				INFOPLIST_FILE = "plugins/DFSound/Resources/SDL/Info-SDL.plist";
 				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
 				WRAPPER_EXTENSION = psxplugin;
@@ -3551,7 +3564,7 @@
 					"$(inherited)",
 				);
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				INFOPLIST_FILE = "plugins/DFSound/Info-AL.plist";
+				INFOPLIST_FILE = "plugins/DFSound/Resources/OpenAL/Info-AL.plist";
 				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
 				WRAPPER_EXTENSION = psxplugin;
diff --git a/macosx/plugins/DFSound/Info-AL.plist b/macosx/plugins/DFSound/Resorces/OpenAL/Info-AL.plist
index f4bef7cc..f4bef7cc 100644
--- a/macosx/plugins/DFSound/Info-AL.plist
+++ b/macosx/plugins/DFSound/Resorces/OpenAL/Info-AL.plist
diff --git a/macosx/plugins/DFSound/Info-SDL.plist b/macosx/plugins/DFSound/Resorces/SDL/Info-SDL.plist
index 2b101e2e..2b101e2e 100644
--- a/macosx/plugins/DFSound/Info-SDL.plist
+++ b/macosx/plugins/DFSound/Resorces/SDL/Info-SDL.plist
diff --git a/macosx/plugins/DFSound/macsrc/SPUPluginController.m b/macosx/plugins/DFSound/macsrc/SPUPluginController.m
index 84ef2876..42a0d197 100644
--- a/macosx/plugins/DFSound/macsrc/SPUPluginController.m
+++ b/macosx/plugins/DFSound/macsrc/SPUPluginController.m
@@ -8,6 +8,7 @@
 
 #import "SPUPluginController.h"
 
+#ifdef DEBUG
 static inline Class GetSPUBaseClass()
 {
 	static Class spuBaseClass;
@@ -16,6 +17,7 @@ static inline Class GetSPUBaseClass()
 	}
 	return spuBaseClass;
 }
+#endif
 
 static void FuncNotAvailable(id sel, id sender, SEL theCmd)
 {