diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2014-09-27 17:28:49 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2014-09-27 17:28:49 +0000 |
| commit | 637f97d9dbdb2451d80f091a650aee1e071df846 (patch) | |
| tree | f87e485b8bdb8b9f7f823ff1df4eca4bec7ebad5 /macosx/Source | |
| parent | 71ac2146a8e40aa5011df370377b3623cd8f1ed6 (diff) | |
| download | pcsxr-637f97d9dbdb2451d80f091a650aee1e071df846.tar.gz | |
OS X: minor maintenance:
Remove reference to "SJIS name": It wasn't being used anymore.
Strip headers from SDL2 when copying it over: we don't need those files.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@91642 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/Source')
| -rw-r--r-- | macosx/Source/LaunchArg.h | 4 | ||||
| -rw-r--r-- | macosx/Source/LaunchArg.m | 10 | ||||
| -rw-r--r-- | macosx/Source/PcsxrPlugin.m | 3 |
3 files changed, 8 insertions, 9 deletions
diff --git a/macosx/Source/LaunchArg.h b/macosx/Source/LaunchArg.h index 28e62fcb..6989c2e8 100644 --- a/macosx/Source/LaunchArg.h +++ b/macosx/Source/LaunchArg.h @@ -19,7 +19,7 @@ typedef enum _LaunchArgOrder { @property (readonly, copy, nonatomic) dispatch_block_t theBlock; @property (readonly, strong) NSString *argument; -- (instancetype)initWithLaunchOrder:(unsigned)order block:(dispatch_block_t)block argument:(NSString*)arg NS_DESIGNATED_INITIALIZER; -- (instancetype)initWithLaunchOrder:(unsigned)order argument:(NSString*)arg block:(dispatch_block_t)block; +- (instancetype)initWithLaunchOrder:(unsigned)order block:(dispatch_block_t)block argument:(NSString*)arg; +- (instancetype)initWithLaunchOrder:(unsigned)order argument:(NSString*)arg block:(dispatch_block_t)block NS_DESIGNATED_INITIALIZER; - (void)addToDictionary:(NSMutableDictionary*)toAdd; @end diff --git a/macosx/Source/LaunchArg.m b/macosx/Source/LaunchArg.m index 56569125..ecaddcb7 100644 --- a/macosx/Source/LaunchArg.m +++ b/macosx/Source/LaunchArg.m @@ -25,11 +25,6 @@ - (instancetype)initWithLaunchOrder:(unsigned)order argument:(NSString*)arg block:(dispatch_block_t)block { - return [self initWithLaunchOrder:order block:block argument:arg]; -} - -- (instancetype)initWithLaunchOrder:(unsigned)order block:(dispatch_block_t)block argument:(NSString*)arg -{ if (self = [super init]) { self.launchOrder = order; self.theBlock = block; @@ -38,6 +33,11 @@ return self; } +- (instancetype)initWithLaunchOrder:(unsigned)order block:(dispatch_block_t)block argument:(NSString*)arg +{ + return [self initWithLaunchOrder:order argument:arg block:block]; +} + - (void)addToDictionary:(NSMutableDictionary*)toAdd { toAdd[self.argument] = self; diff --git a/macosx/Source/PcsxrPlugin.m b/macosx/Source/PcsxrPlugin.m index 219a88b4..1472b634 100644 --- a/macosx/Source/PcsxrPlugin.m +++ b/macosx/Source/PcsxrPlugin.m @@ -51,7 +51,6 @@ + (NSString *)defaultKeyForType:(int)aType { - //return @"Plugin" [PcsxrPlugin prefixForType:aType]; switch (aType) { case PSE_LT_GPU: case PSE_LT_CDR: @@ -175,7 +174,7 @@ return nil; } - // TODO: add support for plugins with multiple functionalities??? + // TODO: add support for plugins with multiple functionalities? PSE_getLibType = (PSEgetLibType) SysLoadSym(pluginRef, kPCSXRGetLibType); if (SysLibError() != nil) { if (([path rangeOfString: @"gpu" options:NSCaseInsensitiveSearch]).length != 0) |