diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-07-04 03:07:44 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-07-04 03:07:44 +0000 |
| commit | dd7da2fae96b9ba6bdbc28f7b26469373801f21e (patch) | |
| tree | 9faf6aa7f2fa2900dcabc3d88d11e87285693e9b /macosx/plugins/PeopsXgl/macsrc/PluginGLView.m | |
| parent | a012af37d7bd3a972d2b3fbb7ed09bc8662e91eb (diff) | |
| download | pcsxr-dd7da2fae96b9ba6bdbc28f7b26469373801f21e.tar.gz | |
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
Diffstat (limited to 'macosx/plugins/PeopsXgl/macsrc/PluginGLView.m')
| -rwxr-xr-x | macosx/plugins/PeopsXgl/macsrc/PluginGLView.m | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/macosx/plugins/PeopsXgl/macsrc/PluginGLView.m b/macosx/plugins/PeopsXgl/macsrc/PluginGLView.m index 483a72d3..85aa636e 100755 --- a/macosx/plugins/PeopsXgl/macsrc/PluginGLView.m +++ b/macosx/plugins/PeopsXgl/macsrc/PluginGLView.m @@ -29,6 +29,8 @@ #include "externals.h" // for PSXDisplay.disable -- should move it elsewhere really #undef BOOL +#import "ARCBridge.h" + @implementation PluginGLView - (BOOL)isOpaque { return YES; } @@ -44,7 +46,7 @@ glLock = [[NSLock alloc] init]; if (nil == glLock) { - [self release]; + AUTORELEASEOBJNORETURN(self); return nil; } @@ -76,12 +78,12 @@ if (!pixFmt) { NSLog(@"No OpenGL pixel format found!\n"); - [self release]; + AUTORELEASEOBJNORETURN(self); return nil; } } - [self setPixelFormat:[pixFmt autorelease]]; + [self setPixelFormat:AUTORELEASEOBJ(pixFmt)]; [[self openGLContext] makeCurrentContext]; @@ -95,6 +97,7 @@ return self; } +#if !__has_feature(objc_arc) - (void)dealloc { [[self openGLContext] makeCurrentContext]; // just in case @@ -102,7 +105,7 @@ [glLock release]; [super dealloc]; } - +#endif - (void)reshape // scrolled, moved or resized { |