Remove 32-bit support on OS X.

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

22 files changed, 16 insertions, 156 deletions

diff --git a/macosx/plugins/Bladesio1/macsrc/PluginConfigController.m b/macosx/plugins/Bladesio1/macsrc/PluginConfigController.m
index 3e77c3ec..9d2c075a 100755
--- a/macosx/plugins/Bladesio1/macsrc/PluginConfigController.m
+++ b/macosx/plugins/Bladesio1/macsrc/PluginConfigController.m
@@ -20,7 +20,6 @@
  */
 
 #import "PluginConfigController.h"
-#import "ARCBridge.h"
 #include "typedefs.h"
 #include "sio1.h"
 
@@ -45,10 +44,9 @@ 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
@@ -68,7 +66,6 @@ void AboutDlgProc()
 	dispatch_async(dispatch_get_main_queue(), ^{
 		[NSApp orderFrontStandardAboutPanelWithOptions:infoPaneDict];
 	});
-	RELEASEOBJ(infoPaneDict);
 }
 
 static inline void RunOnMainThreadSync(dispatch_block_t block)
@@ -193,7 +190,6 @@ void ReadConfig()
 	ReadConfig();
 
 	// load from preferences
-	RELEASEOBJ(keyValues);
 	keyValues = [[defaults dictionaryForKey:PrefsKey] mutableCopy];
 
 	[enabledButton setState: [[keyValues objectForKey:kSioEnabled] boolValue] ? NSOnState : NSOffState];
diff --git a/macosx/plugins/DFCdrom/macsrc/PluginConfigController.m b/macosx/plugins/DFCdrom/macsrc/PluginConfigController.m
index e33f182d..6ea5d12f 100755
--- a/macosx/plugins/DFCdrom/macsrc/PluginConfigController.m
+++ b/macosx/plugins/DFCdrom/macsrc/PluginConfigController.m
@@ -20,7 +20,6 @@
  */
 
 #import "PluginConfigController.h"
-#import "ARCBridge.h"
 #include "cdr.h"
 
 #define APP_ID @"net.pcsxr.DFCdrom"
@@ -48,10 +47,9 @@ 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
@@ -71,7 +69,6 @@ void AboutDlgProc()
 	dispatch_async(dispatch_get_main_queue(), ^{
 		[NSApp orderFrontStandardAboutPanelWithOptions:infoPaneDict];
 	});
-	RELEASEOBJ(infoPaneDict);
 }
 
 void ConfDlgProc()
@@ -144,7 +141,6 @@ void ReadConfig()
 	// and set global values accordingly
 	ReadConfig();
 	
-	RELEASEOBJ(writeDic);
 	self.keyValues = nil;
 	[self close];
 }
@@ -172,15 +168,6 @@ void ReadConfig()
 	}
 }
 
-#if !__has_feature(objc_arc)
-- (void)dealloc
-{
-	self.keyValues = nil;
-	
-	[super dealloc];
-}
-#endif
-
 - (void)awakeFromNib
 {
 }
diff --git a/macosx/plugins/DFInput/macsrc/ControllerList.m b/macosx/plugins/DFInput/macsrc/ControllerList.m
index a88058bc..ed486314 100755
--- a/macosx/plugins/DFInput/macsrc/ControllerList.m
+++ b/macosx/plugins/DFInput/macsrc/ControllerList.m
@@ -20,7 +20,6 @@
  */
 
 #import "ControllerList.h"
-#import "ARCBridge.h"
 #include "pad.h"
 #include "cfg.h"
 
@@ -63,7 +62,6 @@ static NSArray *labelText;
 				 [plugBundle localizedStringForKey:@"R-Stick Left" value:@"" table:nil],
 				 [plugBundle localizedStringForKey:@"R-Stick Down" value:@"" table:nil],
 				 [plugBundle localizedStringForKey:@"R-Stick Up" value:@"" table:nil]];
-			RETAINOBJNORETURN(labelText);
 		});
 	}
 	return self;
diff --git a/macosx/plugins/DFInput/macsrc/PadController.m b/macosx/plugins/DFInput/macsrc/PadController.m
index 91f0baf0..f667717a 100755
--- a/macosx/plugins/DFInput/macsrc/PadController.m
+++ b/macosx/plugins/DFInput/macsrc/PadController.m
@@ -21,7 +21,6 @@
 
 #import <Cocoa/Cocoa.h>
 #import "PadController.h"
-#import "ARCBridge.h"
 #include "pad.h"
 
 static inline void RunOnMainThreadSync(dispatch_block_t block)
@@ -330,8 +329,6 @@ void SavePADConfig()
 						 pad2Dict, kDFPad2,
 						 nil] forKey:PrefsKey];
 	[defaults synchronize];
-	RELEASEOBJ(pad1Dict);
-	RELEASEOBJ(pad2Dict);
 }
 
 void DoAbout()
@@ -345,9 +342,8 @@ void DoAbout()
 	if (path) {
 		credits = [[NSAttributedString alloc] initWithPath: path
 				documentAttributes:NULL];
-		AUTORELEASEOBJNORETURN(credits);
 	} else {
-		credits = AUTORELEASEOBJ([[NSAttributedString alloc] initWithString:@""]);
+		credits = [[NSAttributedString alloc] initWithString:@""];
 	}
 
 	// Get Application Icon
@@ -367,7 +363,6 @@ void DoAbout()
 	dispatch_async(dispatch_get_main_queue(), ^{
 		[NSApp orderFrontStandardAboutPanelWithOptions:infoPaneDict];
 	});
-	RELEASEOBJ(infoPaneDict);
 }
 
 long DoConfiguration()
diff --git a/macosx/plugins/DFInput/macsrc/PadView.m b/macosx/plugins/DFInput/macsrc/PadView.m
index 7cafa4b1..f8936888 100755
--- a/macosx/plugins/DFInput/macsrc/PadView.m
+++ b/macosx/plugins/DFInput/macsrc/PadView.m
@@ -20,7 +20,6 @@
  */
 
 #import "PadView.h"
-#import "ARCBridge.h"
 #include "pad.h"
 
 @implementation PadView
@@ -34,14 +33,6 @@
 	return self;
 }
 
-#if !__has_feature(objc_arc)
-- (void)dealloc
-{
-	[controller release];
-	[super dealloc];
-}
-#endif
-
 - (void)drawRect:(NSRect)rect
 {
 }
@@ -80,7 +71,6 @@
 #endif
 		[joystickItem setTag:i + 1];
         [[deviceMenu menu] addItem:joystickItem];
-		RELEASEOBJ(joystickItem);
 	}
 
 	if (g.cfg.PadDef[which].DevNum >= SDL_NumJoysticks()) {
diff --git a/macosx/plugins/DFInput/macsrc/cfgHelper.m b/macosx/plugins/DFInput/macsrc/cfgHelper.m
index e15a9a1e..406252fc 100644
--- a/macosx/plugins/DFInput/macsrc/cfgHelper.m
+++ b/macosx/plugins/DFInput/macsrc/cfgHelper.m
@@ -7,7 +7,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "ARCBridge.h"
 #import "PadController.h"
 #include "cfg.h"
 
diff --git a/macosx/plugins/DFNet/macsrc/PluginConfigController.m b/macosx/plugins/DFNet/macsrc/PluginConfigController.m
index ad186d6d..92ede4c4 100755
--- a/macosx/plugins/DFNet/macsrc/PluginConfigController.m
+++ b/macosx/plugins/DFNet/macsrc/PluginConfigController.m
@@ -21,7 +21,6 @@
 
 #import "PluginConfigController.h"
 #include "dfnet.h"
-#import "ARCBridge.h"
 
 #define kIPADDRKEY @"IP Address"
 #define kIPPORT @"IP Port"
@@ -52,9 +51,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
@@ -73,7 +71,6 @@ void AboutDlgProc()
 	dispatch_async(dispatch_get_main_queue(), ^{
 		[NSApp orderFrontStandardAboutPanelWithOptions:infoPaneDict];
 	});
-	RELEASEOBJ(infoPaneDict);
 }
 
 void ConfDlgProc()
diff --git a/macosx/plugins/DFNet/macsrc/SockDialog.m b/macosx/plugins/DFNet/macsrc/SockDialog.m
index 77a09f04..0114f33f 100755
--- a/macosx/plugins/DFNet/macsrc/SockDialog.m
+++ b/macosx/plugins/DFNet/macsrc/SockDialog.m
@@ -10,7 +10,6 @@
 #include "dfnet.h"
 
 #import "EmuThread.h"
-#import "ARCBridge.h"
 
 void SysMessage(const char *fmt, ...)
 {
@@ -81,8 +80,6 @@ void sockDestroyWaitDlg()
 	RunOnMainThreadSync(^{
 		if (globalSock != nil) {
 			[globalSock close];
-			
-			RELEASEOBJ(globalSock);
 			globalSock = nil;
 		}
 	});
@@ -102,12 +99,4 @@ void sockDestroyWaitDlg()
 	return self;
 }
 
-#if !__has_feature(objc_arc)
--(void)dealloc
-{
-	
-	[super dealloc];
-}
-#endif
-
 @end
diff --git a/macosx/plugins/DFSound/macsrc/NamedSlider.h b/macosx/plugins/DFSound/macsrc/NamedSlider.h
index 95ec014c..6a5c869a 100755
--- a/macosx/plugins/DFSound/macsrc/NamedSlider.h
+++ b/macosx/plugins/DFSound/macsrc/NamedSlider.h
@@ -1,13 +1,12 @@
 /* NetSfPeopsSPUPluginNamedSlider */
 
 #import <Cocoa/Cocoa.h>
-#import "ARCBridge.h"
 
 @interface NamedSlider : NSSlider
 {
 	NSArray *strings;
 	__unsafe_unretained Class pluginClass;
 }
-@property (arcretain) NSArray *strings;
+@property (strong) NSArray *strings;
 @property (unsafe_unretained) Class pluginClass;
 @end
diff --git a/macosx/plugins/DFSound/macsrc/NamedSlider.m b/macosx/plugins/DFSound/macsrc/NamedSlider.m
index 8411481d..90a89eb5 100755
--- a/macosx/plugins/DFSound/macsrc/NamedSlider.m
+++ b/macosx/plugins/DFSound/macsrc/NamedSlider.m
@@ -4,16 +4,6 @@
 @synthesize pluginClass;
 @synthesize strings;
 
-#if !__has_feature(objc_arc)
-- (void)dealloc
-{
-	self.strings = nil;
-	self.pluginClass = nil;
-	
-	[super dealloc];
-}
-#endif
-
 - (NSString *)stringValue
 {
 	NSInteger index = [self integerValue];
diff --git a/macosx/plugins/DFSound/macsrc/PluginController.m b/macosx/plugins/DFSound/macsrc/PluginController.m
index cc6b330a..12a2b3d7 100755
--- a/macosx/plugins/DFSound/macsrc/PluginController.m
+++ b/macosx/plugins/DFSound/macsrc/PluginController.m
@@ -2,7 +2,6 @@
 #include "stdafx.h"
 #include "externals.h"
 #include "maccfg.h"
-#include "ARCBridge.h"
 
 #ifdef ENABLE_NLS
 #include <libintl.h>
@@ -62,9 +61,9 @@ void DoAbout()
 	NSString *path = [bundle pathForResource:@"Credits" ofType:@"rtf"];
 	NSAttributedString *credits;
 	if (path) {
-		credits =  AUTORELEASEOBJ([[NSAttributedString alloc] initWithPath: path documentAttributes:NULL]);
+		credits =  [[NSAttributedString alloc] initWithPath: path documentAttributes:NULL];
 	} else {
-		credits = AUTORELEASEOBJ([[NSAttributedString alloc] initWithString:@""]);
+		credits = [[NSAttributedString alloc] initWithString:@""];
 	}
 	
 	// Get Application Icon
@@ -84,7 +83,6 @@ void DoAbout()
 	dispatch_async(dispatch_get_main_queue(), ^{
 		[NSApp orderFrontStandardAboutPanelWithOptions:infoPaneDict];
 	});
-	RELEASEOBJ(infoPaneDict);
 }
 
 long DoConfiguration()
diff --git a/macosx/plugins/DFSound/macsrc/SPUPluginController.h b/macosx/plugins/DFSound/macsrc/SPUPluginController.h
index c826e58f..d1e6924a 100644
--- a/macosx/plugins/DFSound/macsrc/SPUPluginController.h
+++ b/macosx/plugins/DFSound/macsrc/SPUPluginController.h
@@ -8,7 +8,6 @@
 
 #import <Cocoa/Cocoa.h>
 #import "NamedSlider.h"
-#import "ARCBridge.h"
 
 @interface SPUPluginController : NSWindowController
 {
@@ -23,7 +22,7 @@
 	
 	NSMutableDictionary *keyValues;
 }
-@property (readwrite, arcretain) NSMutableDictionary *keyValues;
+@property (readwrite, strong) NSMutableDictionary *keyValues;
 - (IBAction)cancel:(id)sender;
 - (IBAction)ok:(id)sender;
 - (IBAction)reset:(id)sender;
diff --git a/macosx/plugins/DFSound/macsrc/SPUPluginController.m b/macosx/plugins/DFSound/macsrc/SPUPluginController.m
index 83598618..84ef2876 100644
--- a/macosx/plugins/DFSound/macsrc/SPUPluginController.m
+++ b/macosx/plugins/DFSound/macsrc/SPUPluginController.m
@@ -60,13 +60,4 @@ static void FuncNotAvailable(id sel, id sender, SEL theCmd)
 	NotAvailableWarn(nil);
 }
 
-#if !__has_feature(objc_arc)
-- (void)dealloc
-{
-	self.keyValues = nil;
-	
-	[super dealloc];
-}
-#endif
-
 @end
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;
 	}
diff --git a/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m b/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
index ee625cdd..90043735 100755
--- a/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
+++ b/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
@@ -11,7 +11,6 @@
 #include "menu.h"
 #include <OpenGL/gl.h> // bah, "externals.h" thinks include files are for wimps; OpenGL header, in fact, is needed
 #include "externals.h"
-#import "ARCBridge.h"
 #import "PluginGLView.h"
 
 #ifdef ENABLE_NLS
@@ -59,9 +58,9 @@ void AboutDlgProc()
 	NSString *path = [bundle pathForResource:@"Credits" ofType:@"rtf"];
 	NSAttributedString *credits;
 	if (path) {
-		credits = AUTORELEASEOBJ([[NSAttributedString alloc] initWithPath:path documentAttributes:NULL]);
+		credits = [[NSAttributedString alloc] initWithPath:path documentAttributes:NULL];
 	} else {
-		credits = AUTORELEASEOBJ([[NSAttributedString alloc] initWithString:@""]);
+		credits = [[NSAttributedString alloc] initWithString:@""];
 	}
 	
 	// Get Application Icon
@@ -81,7 +80,6 @@ void AboutDlgProc()
 	dispatch_async(dispatch_get_main_queue(), ^{
 		[NSApp orderFrontStandardAboutPanelWithOptions:infoPaneDict];
 	});
-	RELEASEOBJ(infoPaneDict);
 }
 
 void DlgProc()
@@ -142,7 +140,6 @@ void PrepFactoryDefaultPreferences(void)
 		[tmpDict setObject:NSStringFromSize(NSMakeSize(800, 600)) forKey:kWindowSize];
 		[defaults setObject:tmpDict forKey:PrefsKey];
 		[defaults synchronize];
-		RELEASEOBJ(tmpDict);
 	}
 	keyValues = nil;
 	
@@ -455,15 +452,6 @@ void ReadConfig(void)
 	}
 }
 
-#if !__has_feature(objc_arc)
-- (void)dealloc
-{
-	self.keyValues = nil;
-	
-	[super dealloc];
-}
-#endif
-
 @end
 
 #import "OSXPlugLocalization.h"
diff --git a/macosx/plugins/PeopsXgl/macsrc/PluginGLView.m b/macosx/plugins/PeopsXgl/macsrc/PluginGLView.m
index b2ec911a..ec4eb915 100755
--- a/macosx/plugins/PeopsXgl/macsrc/PluginGLView.m
+++ b/macosx/plugins/PeopsXgl/macsrc/PluginGLView.m
@@ -29,8 +29,6 @@
 #include "externals.h" // for PSXDisplay.disable -- should move it elsewhere really
 #undef BOOL
 
-#import "ARCBridge.h"
-
 @implementation PluginGLView
 
 - (BOOL)isOpaque
@@ -51,7 +49,6 @@
 	
 	glLock = [[NSLock alloc] init];
 	if (nil == glLock) {
-		AUTORELEASEOBJNORETURN(self);
 		return nil;
 	}
 	
@@ -83,12 +80,11 @@
 		if (!pixFmt) {
 			NSLog(@"No OpenGL pixel format found!\n");
 			
-			AUTORELEASEOBJNORETURN(self);
 			return nil;
 		}
 	}
 	
-	[self setPixelFormat:AUTORELEASEOBJ(pixFmt)];
+	[self setPixelFormat:pixFmt];
 	
 	[[self openGLContext] makeCurrentContext];
 	
@@ -106,10 +102,6 @@
 {
 	[[self openGLContext] makeCurrentContext]; // just in case
 	[NSOpenGLContext clearCurrentContext];
-#if !__has_feature(objc_arc)
-	[glLock release];
-	[super dealloc];
-#endif
 }
 
 - (void)reshape	// scrolled, moved or resized
diff --git a/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m b/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m
index 92d982c8..e2abff7b 100755
--- a/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m
+++ b/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m
@@ -26,7 +26,6 @@
 #include "externals.h"
 #include "draw.h" // for CreateScanLines()
 #undef BOOL
-#import "ARCBridge.h"
 
 // not sure why these aren't class or instance variables...
 NSWindow *gameWindow;
@@ -221,8 +220,6 @@ NSRect FitRectInRect(NSRect source, NSRect destination)
 	
 	[nc removeObserver:self];
 	windowFrame = [[self window] frame]; // huh?
-
-	SUPERDEALLOC;
 }
 
 // forget keyDownEvents
@@ -343,7 +340,6 @@ NSRect FitRectInRect(NSRect source, NSRect destination)
 - (BOOL)windowShouldClose:(id)sender
 {
 	[[NSNotificationCenter defaultCenter] postNotificationName:@"emuWindowDidClose" object:self];
-	AUTORELEASEOBJNORETURN(gameController);
 	gameController = nil;
 	gameWindow = nil;
     CGReleaseAllDisplays();
diff --git a/macosx/plugins/PeopsXgl/macsrc/drawgl.m b/macosx/plugins/PeopsXgl/macsrc/drawgl.m
index 550b3d72..3218624b 100755
--- a/macosx/plugins/PeopsXgl/macsrc/drawgl.m
+++ b/macosx/plugins/PeopsXgl/macsrc/drawgl.m
@@ -29,7 +29,6 @@
 #include "gpu.h"
 #include "menu.h"
 #include "drawgl.h"
-#import "ARCBridge.h"
 
 ////////////////////////////////////////////////////////////////////////////////////
 // misc globals
@@ -167,7 +166,6 @@ void CloseDisplay(void)
 {
 	if (gameController) {
 		[gameController close];
-		RELEASEOBJ(gameController);
 		gameController = nil;
 		gameWindow = nil;
 	}