diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-09-10 18:18:15 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-09-10 18:18:15 +0000 |
| commit | a3ac4842bd5c7058b1363f7d3307f61724fc7178 (patch) | |
| tree | 0e71322d034432a925cbdab2f5e92bc891d3efde /macosx/plugins/PeopsXgl/macsrc | |
| parent | aca9c8411f7b86b1ee685965c70e7be682a9a4d0 (diff) | |
| download | pcsxr-a3ac4842bd5c7058b1363f7d3307f61724fc7178.tar.gz | |
Remove 32-bit support on OS X.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@87114 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/plugins/PeopsXgl/macsrc')
4 files changed, 3 insertions, 29 deletions
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; } |
