Remove 32-bit support on OS X.

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

5 files changed, 5 insertions, 47 deletions

diff --git a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.h b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.h
index 3a8ac98a..e5b3aac0 100755
--- a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.h
+++ b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.h
@@ -3,7 +3,6 @@
 #define PluginConfigController NetSfPeopsSoftGPUPluginConfigController
 
 #import <Cocoa/Cocoa.h>
-#import "ARCBridge.h"
 
 @interface NetSfPeopsSoftGPUPluginConfigController : NSWindowController
 {
@@ -29,8 +28,8 @@
 	NSMutableDictionary *keyValues;
 }
 
-@property (arcretain) NSURL *vertexPath;
-@property (arcretain) NSURL *fragmentPath;
+@property (strong) NSURL *vertexPath;
+@property (strong) NSURL *fragmentPath;
 
 - (IBAction)cancel:(id)sender;
 - (IBAction)ok:(id)sender;
diff --git a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m
index 1410de88..d891c74c 100755
--- a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m
+++ b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m
@@ -4,7 +4,6 @@
 #include "menu.h"
 #include "externals.h"
 #import "SGPUPreferences.h"
-#import "ARCBridge.h"
 #import "PluginGLView.h"
 
 #ifdef ENABLE_NLS
@@ -54,9 +53,8 @@ void AboutDlgProc()
 	if (path) {
 		credits = [[NSAttributedString alloc] initWithPath: path
 				documentAttributes:NULL];
-		AUTORELEASEOBJNORETURN(credits);
 	} else {
-		credits = AUTORELEASEOBJ([[NSAttributedString alloc] initWithString:@""]);
+		credits = [[NSAttributedString alloc] initWithString:@""];
 	}
 	
 	// Get Application Icon
@@ -76,7 +74,6 @@ void AboutDlgProc()
 	dispatch_async(dispatch_get_main_queue(), ^{
 		[NSApp orderFrontStandardAboutPanelWithOptions:infoPaneDict];
 	});
-	RELEASEOBJ(infoPaneDict);
 }
 
 void SoftDlgProc()
@@ -287,7 +284,7 @@ void ReadConfig(void)
 }
 
 - (IBAction)selectShader:(id)sender {
-	NSOpenPanel *openPanel = RETAINOBJ([NSOpenPanel openPanel]);
+	NSOpenPanel *openPanel = [NSOpenPanel openPanel];
 	[openPanel setAllowsMultipleSelection:NO];
 	[openPanel setCanChooseDirectories:NO];
 	[openPanel setCanChooseFiles:YES];
@@ -299,8 +296,6 @@ void ReadConfig(void)
 			[self setFragmentPathInfo:[openPanel URL]];
 		}
 	}
-	
-	RELEASEOBJ(openPanel);
 }
 
 - (void)loadValues
@@ -310,7 +305,6 @@ void ReadConfig(void)
 	ReadConfig();
 	
 	/* load from preferences */
-	RELEASEOBJ(keyValues);
 	keyValues = [[defaults dictionaryForKey:PrefsKey] mutableCopy];
 	
 	{
@@ -349,17 +343,6 @@ void ReadConfig(void)
 	[self toggleShader:shaders];
 }
 
-#if !__has_feature(objc_arc)
-- (void)dealloc
-{
-	[vertexPath release];
-	[fragmentPath release];
-	[keyValues release];
-	
-	[super dealloc];
-}
-#endif
-
 @end
 
 #import "OSXPlugLocalization.h"
diff --git a/macosx/plugins/DFXVideo/macsrc/PluginGLView.m b/macosx/plugins/DFXVideo/macsrc/PluginGLView.m
index 778721fb..592d57f2 100755
--- a/macosx/plugins/DFXVideo/macsrc/PluginGLView.m
+++ b/macosx/plugins/DFXVideo/macsrc/PluginGLView.m
@@ -26,7 +26,6 @@
 #undef BOOL
 #include "gpu.h"
 #include "swap.h"
-#import "ARCBridge.h"
 
 #include <time.h>
 extern time_t tStart;
@@ -91,7 +90,6 @@ void BlitScreen16NS(unsigned char * surf,long x,long y)
 
 	glLock = [[NSLock alloc] init];
 	if (nil == glLock) {
-		AUTORELEASEOBJNORETURN(self);
 		return nil;
 	}
 
@@ -121,12 +119,11 @@ void BlitScreen16NS(unsigned char * surf,long x,long y)
 		if (!pixFmt) {
 			NSLog(@"No OpenGL pixel format found!\n");
 			
-			AUTORELEASEOBJNORETURN(self);
 			return nil;
 		}
 	}
 	
-	[self setPixelFormat:AUTORELEASEOBJ(pixFmt)];
+	[self setPixelFormat:pixFmt];
 
 	/*
 	long swapInterval = 1 ;
@@ -179,7 +176,6 @@ void BlitScreen16NS(unsigned char * surf,long x,long y)
 	image_type = GL_UNSIGNED_SHORT_1_5_5_5_REV;
 	image_base = (GLubyte *) calloc(((IMAGE_COUNT * image_width * image_height) / 3) * 4, image_depth >> 3);
 	if (image_base == nil) {
-		AUTORELEASEOBJNORETURN(self);
 		return nil;
 	}
 
@@ -218,12 +214,6 @@ void BlitScreen16NS(unsigned char * surf,long x,long y)
 	
 	if (image_base)
 		free(image_base);
-	
-#if !__has_feature(objc_arc)
-	[glLock release];
-
-	[super dealloc];
-#endif
 }
 
 - (BOOL)isOpaque
diff --git a/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m b/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m
index a45a00f3..17431fc3 100755
--- a/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m
+++ b/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m
@@ -19,7 +19,6 @@
 #import "PluginWindowController.h"
 #import "PluginWindow.h"
 #include "externals.h"
-#import "ARCBridge.h"
 #undef BOOL
 
 NSWindow *gameWindow;
@@ -63,18 +62,9 @@ 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
@@ -159,7 +149,6 @@ NSRect windowFrame;
 
 		if (fullWindow) {
 			[fullWindow orderOut:self];
-			AUTORELEASEOBJNORETURN(fullWindow);
 			fullWindow = nil;
 			
 			[[glView openGLContext] setView:glView];
@@ -222,7 +211,6 @@ NSRect windowFrame;
 		return NO;
 	}
 	[[NSNotificationCenter defaultCenter] postNotificationName:@"emuWindowDidClose" object:self];
-	AUTORELEASEOBJNORETURN(gameController);
 	gameController = nil;
 	gameWindow = nil;
 	
diff --git a/macosx/plugins/DFXVideo/macsrc/drawgl.m b/macosx/plugins/DFXVideo/macsrc/drawgl.m
index 3f768307..97cdf52d 100755
--- a/macosx/plugins/DFXVideo/macsrc/drawgl.m
+++ b/macosx/plugins/DFXVideo/macsrc/drawgl.m
@@ -23,7 +23,6 @@
 #include "draw.h"
 #include "gpu.h"
 #include "menu.h"
-#include "ARCBridge.h"
 
 ////////////////////////////////////////////////////////////////////////////////////
 // misc globals
@@ -133,7 +132,6 @@ void CloseDisplay(void)
 {
 	if (gameController) {
 		[gameController close];
-		RELEASEOBJ(gameController);
 		gameController = nil;
 		gameWindow = nil;
 	}