From dd7da2fae96b9ba6bdbc28f7b26469373801f21e Mon Sep 17 00:00:00 2001
From: "SND\\MaddTheSane_cp"
 <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Thu, 4 Jul 2013 03:07:44 +0000
Subject: Make the plug-ins use ARC in 64-bit mode. Change how the preprocessor
 macros are managed on OS X. Set the name of the product to the target name.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85795 e17a0e51-4ae3-4d35-97c3-1a29b211df97
---
 macosx/plugins/DFXVideo/macsrc/PluginWindowController.m | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'macosx/plugins/DFXVideo/macsrc/PluginWindowController.m')

diff --git a/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m b/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m
index 7bfa656f..47d9a512 100755
--- a/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m
+++ b/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m
@@ -18,8 +18,8 @@
 
 #import "PluginWindowController.h"
 #import "PluginWindow.h"
-#import "Carbon/Carbon.h"
 #include "externals.h"
+#import "ARCBridge.h"
 #undef BOOL
 
 NSWindow *gameWindow;
@@ -63,13 +63,18 @@ NSRect windowFrame;
 {
 	if (fullWindow) {
 		[fullWindow orderOut:self];
+#if !__has_feature(objc_arc)
+
 		[fullWindow autorelease];
 		fullWindow = nil;
+#endif
 	}
 	
 	windowFrame = [[self window] frame];
 	
+#if !__has_feature(objc_arc)
 	[super dealloc];
+#endif
 }
 
 // forget keyDownEvents
@@ -154,7 +159,7 @@ NSRect windowFrame;
 
 		if (fullWindow) {
 			[fullWindow orderOut:self];
-			[fullWindow autorelease];
+			AUTORELEASEOBJNORETURN(fullWindow);
 			fullWindow = nil;
 			
 			[[glView openGLContext] setView:glView];
@@ -217,7 +222,7 @@ NSRect windowFrame;
 		return NO;
 	}
 	[[NSNotificationCenter defaultCenter] postNotificationName:@"emuWindowDidClose" object:self];
-	[gameController autorelease];
+	AUTORELEASEOBJNORETURN(gameController);
 	gameController = nil;
 	gameWindow = nil;
 	
-- 
cgit v1.2.3