diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-07-05 01:04:08 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-07-05 01:04:08 +0000 |
| commit | 98d7380ec7887a091c62d9d860815c70b0edffe8 (patch) | |
| tree | dfd92ac07aea30311dfe7af632a0a5c49662a981 /macosx/PluginList.m | |
| parent | b05c91bb3b900edee49546451a0eecf54988a3b7 (diff) | |
| download | pcsxr-98d7380ec7887a091c62d9d860815c70b0edffe8.tar.gz | |
Making the SIO plug-ins work on OS X.
Setting the deployment target on the SIO plug-in be set to 10.7, since we don't we have a 10.6 version of PCSXR that can use it.
Adding Xcode config files.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85826 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/PluginList.m')
| -rwxr-xr-x | macosx/PluginList.m | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/macosx/PluginList.m b/macosx/PluginList.m index fac8f4b4..ce65ebe4 100755 --- a/macosx/PluginList.m +++ b/macosx/PluginList.m @@ -15,7 +15,7 @@ //NSMutableArray *plugins; static PluginList __arcweak *sPluginList = nil; -const static int typeList[5] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD, PSE_LT_NET}; +const static int typeList[] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD, PSE_LT_NET, PSE_LT_SIO1}; @implementation PluginList @@ -83,6 +83,7 @@ const static int typeList[5] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD, [activeCdrPlugin release]; [activePadPlugin release]; [activeNetPlugin release]; + [activeSIO1Plugin release]; [pluginList release]; @@ -186,6 +187,8 @@ const static int typeList[5] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD, if ([activeCdrPlugin runAs:PSE_LT_CDR] != 0) bad = YES; if ([activePadPlugin runAs:PSE_LT_PAD] != 0) bad = YES; if ([activeNetPlugin runAs:PSE_LT_NET] != 0) bad = YES; + if ([activeSIO1Plugin runAs:PSE_LT_SIO1] != 0) bad = YES; + return !bad; } @@ -198,6 +201,7 @@ const static int typeList[5] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD, case PSE_LT_SPU: return activeSpuPlugin; break; case PSE_LT_PAD: return activePadPlugin; break; case PSE_LT_NET: return activeNetPlugin; break; + case PSE_LT_SIO1: return activeNetPlugin; break; } return nil; @@ -208,10 +212,11 @@ const static int typeList[5] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD, PcsxrPlugin *pluginPtr = nil; switch (type) { - case PSE_LT_GPU: - case PSE_LT_CDR: - case PSE_LT_SPU: - case PSE_LT_PAD: + case PSE_LT_SIO1: + case PSE_LT_GPU: + case PSE_LT_CDR: + case PSE_LT_SPU: + case PSE_LT_PAD: case PSE_LT_NET: pluginPtr = [self activePluginForType:type]; break; default: return NO; break; } @@ -253,6 +258,9 @@ const static int typeList[5] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD, case PSE_LT_NET: activeNetPlugin = RETAINOBJ(plugin); break; + case PSE_LT_SIO1: + activeSIO1Plugin = RETAINOBJ(plugin); + break; } // write path to the correct config entry |