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 | |
| 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')
| -rwxr-xr-x | macosx/ConfigurationController.h | 1 | ||||
| -rwxr-xr-x | macosx/ConfigurationController.m | 1 | ||||
| -rw-r--r-- | macosx/English.lproj/Configuration.xib | 428 | ||||
| -rw-r--r-- | macosx/Pcsxr-Debug.xcconfig | 11 | ||||
| -rw-r--r-- | macosx/Pcsxr-Instrument.xcconfig | 5 | ||||
| -rw-r--r-- | macosx/Pcsxr-Release.xcconfig | 11 | ||||
| -rw-r--r-- | macosx/Pcsxr.xcconfig | 17 | ||||
| -rw-r--r-- | macosx/Pcsxr.xcodeproj/project.pbxproj | 167 | ||||
| -rw-r--r-- | macosx/Pcsxr.xcworkspace/contents.xcworkspacedata | 6 | ||||
| -rwxr-xr-x | macosx/PcsxrController.m | 1 | ||||
| -rwxr-xr-x | macosx/PcsxrMemoryObject.m | 6 | ||||
| -rwxr-xr-x | macosx/PcsxrPlugin.m | 9 | ||||
| -rwxr-xr-x | macosx/PluginList.h | 1 | ||||
| -rwxr-xr-x | macosx/PluginList.m | 18 | ||||
| -rw-r--r-- | macosx/plugins/Bladesio1/Bladesio1.xcodeproj/project.pbxproj | 6 | ||||
| -rw-r--r-- | macosx/plugins/Bladesio1/English.lproj/Bladesio1PluginConfig.xib | 940 | ||||
| -rw-r--r-- | macosx/plugins/Bladesio1/English.lproj/Credits.rtf | 15 | ||||
| -rw-r--r-- | macosx/plugins/Bladesio1/English.lproj/Localizable.strings | 2 | ||||
| -rwxr-xr-x | macosx/plugins/Bladesio1/macsrc/PluginConfigController.m | 41 |
19 files changed, 1484 insertions, 202 deletions
diff --git a/macosx/ConfigurationController.h b/macosx/ConfigurationController.h index badc93c0..b8da2973 100755 --- a/macosx/ConfigurationController.h +++ b/macosx/ConfigurationController.h @@ -17,6 +17,7 @@ extern NSString *const memCardChangeNumberKey; IBOutlet PluginController *padPlugin; IBOutlet PluginController *soundPlugin; IBOutlet PluginController *netPlugin; + IBOutlet PluginController *sio1Plugin; IBOutlet id noXaAudioCell; IBOutlet id sioIrqAlwaysCell; diff --git a/macosx/ConfigurationController.m b/macosx/ConfigurationController.m index 0eb44642..1cf18dbd 100755 --- a/macosx/ConfigurationController.m +++ b/macosx/ConfigurationController.m @@ -240,6 +240,7 @@ NSString *const memCardChangeNumberKey = @"PcsxrMemoryCardThatChangedKey"; [padPlugin setPluginsTo:[list pluginsForType:PSE_LT_PAD] withType: PSE_LT_PAD]; [cdromPlugin setPluginsTo:[list pluginsForType:PSE_LT_CDR] withType: PSE_LT_CDR]; [netPlugin setPluginsTo:[list pluginsForType:PSE_LT_NET] withType: PSE_LT_NET]; + [sio1Plugin setPluginsTo:[list pluginsForType:PSE_LT_SIO1] withType:PSE_LT_SIO1]; // Setup hotkey view [hkController initialize]; diff --git a/macosx/English.lproj/Configuration.xib b/macosx/English.lproj/Configuration.xib index 714f45eb..49aef8cb 100644 --- a/macosx/English.lproj/Configuration.xib +++ b/macosx/English.lproj/Configuration.xib @@ -2,13 +2,13 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00"> <data> <int key="IBDocument.SystemTarget">1070</int> - <string key="IBDocument.SystemVersion">12C60</string> - <string key="IBDocument.InterfaceBuilderVersion">2844</string> - <string key="IBDocument.AppKitVersion">1187.34</string> - <string key="IBDocument.HIToolboxVersion">625.00</string> + <string key="IBDocument.SystemVersion">12E55</string> + <string key="IBDocument.InterfaceBuilderVersion">3084</string> + <string key="IBDocument.AppKitVersion">1187.39</string> + <string key="IBDocument.HIToolboxVersion">626.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">2844</string> + <string key="NS.object.0">3084</string> </object> <array key="IBDocument.IntegratedClassDependencies"> <string>NSBox</string> @@ -67,6 +67,7 @@ <string key="NSFrame">{{13, 10}, {526, 344}}</string> <reference key="NSSuperview" ref="644483536"/> <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="494923943"/> <array class="NSMutableArray" key="NSTabViewItems"> <object class="NSTabViewItem" id="150404821"> <object class="NSMutableString" key="NSIdentifier"> @@ -709,7 +710,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <characters key="NS.bytes">2</characters> </object> <object class="NSView" key="NSView" id="494923943"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder" ref="145760790"/> <int key="NSvFlags">256</int> <array class="NSMutableArray" key="NSSubviews"> <object class="NSBox" id="30192545"> @@ -733,6 +734,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSvFlags">259</int> <string key="NSFrame">{{98, 7}, {111, 28}}</string> <reference key="NSSuperview" ref="674673083"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="23337545"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="1054541347"> @@ -758,6 +760,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSvFlags">262</int> <string key="NSFrame">{{9, 7}, {90, 28}}</string> <reference key="NSSuperview" ref="674673083"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="659624019"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="299254513"> @@ -783,6 +786,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSvFlags">258</int> <string key="NSFrame">{{11, 35}, {196, 26}}</string> <reference key="NSSuperview" ref="674673083"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="857424577"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="170522740"> @@ -833,11 +837,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </array> <string key="NSFrame">{{2, 2}, {218, 73}}</string> <reference key="NSSuperview" ref="711664786"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="983879338"/> </object> </array> <string key="NSFrame">{{0, 200}, {222, 90}}</string> <reference key="NSSuperview" ref="613304714"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="674673083"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> @@ -870,6 +876,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSvFlags">259</int> <string key="NSFrame">{{98, 7}, {111, 28}}</string> <reference key="NSSuperview" ref="451090636"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="490231628"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="175241227"> @@ -899,6 +906,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSvFlags">262</int> <string key="NSFrame">{{9, 7}, {90, 28}}</string> <reference key="NSSuperview" ref="451090636"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="1060851478"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="449658334"> @@ -924,6 +932,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSvFlags">258</int> <string key="NSFrame">{{11, 35}, {196, 26}}</string> <reference key="NSSuperview" ref="451090636"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="921855531"/> <int key="NSTag">1</int> <bool key="NSEnabled">YES</bool> @@ -975,11 +984,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </array> <string key="NSFrame">{{2, 2}, {218, 73}}</string> <reference key="NSSuperview" ref="23337545"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="184922838"/> </object> </array> <string key="NSFrame">{{249, 200}, {222, 90}}</string> <reference key="NSSuperview" ref="613304714"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="451090636"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> @@ -1012,6 +1023,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSvFlags">259</int> <string key="NSFrame">{{98, 7}, {111, 28}}</string> <reference key="NSSuperview" ref="408048101"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="695086223"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="554603770"> @@ -1037,6 +1049,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSvFlags">262</int> <string key="NSFrame">{{9, 7}, {90, 28}}</string> <reference key="NSSuperview" ref="408048101"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="255294672"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="154903563"> @@ -1062,6 +1075,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSvFlags">258</int> <string key="NSFrame">{{11, 35}, {196, 26}}</string> <reference key="NSSuperview" ref="408048101"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="132376695"/> <int key="NSTag">2</int> <bool key="NSEnabled">YES</bool> @@ -1113,11 +1127,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </array> <string key="NSFrame">{{2, 2}, {218, 73}}</string> <reference key="NSSuperview" ref="490231628"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="1001529761"/> </object> </array> <string key="NSFrame">{{0, 106}, {222, 90}}</string> <reference key="NSSuperview" ref="613304714"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="408048101"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> @@ -1150,7 +1166,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSvFlags">259</int> <string key="NSFrame">{{98, 7}, {111, 28}}</string> <reference key="NSSuperview" ref="143420558"/> - <reference key="NSNextKeyView" ref="145760790"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="721006038"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="933521081"> <int key="NSCellFlags">67108864</int> @@ -1175,6 +1192,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSvFlags">262</int> <string key="NSFrame">{{9, 7}, {90, 28}}</string> <reference key="NSSuperview" ref="143420558"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="986737125"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="773749244"> @@ -1200,6 +1218,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSvFlags">258</int> <string key="NSFrame">{{11, 35}, {196, 26}}</string> <reference key="NSSuperview" ref="143420558"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="181214375"/> <int key="NSTag">2</int> <bool key="NSEnabled">YES</bool> @@ -1250,11 +1269,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </array> <string key="NSFrame">{{2, 2}, {218, 73}}</string> <reference key="NSSuperview" ref="950422833"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="99318986"/> </object> </array> <string key="NSFrame">{{0, 12}, {222, 90}}</string> <reference key="NSSuperview" ref="613304714"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="143420558"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> @@ -1287,6 +1308,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSvFlags">259</int> <string key="NSFrame">{{98, 7}, {111, 28}}</string> <reference key="NSSuperview" ref="221272233"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="950422833"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="350454119"> @@ -1312,6 +1334,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSvFlags">262</int> <string key="NSFrame">{{9, 7}, {90, 28}}</string> <reference key="NSSuperview" ref="221272233"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="701329658"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="268195893"> @@ -1337,6 +1360,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSvFlags">258</int> <string key="NSFrame">{{11, 35}, {196, 26}}</string> <reference key="NSSuperview" ref="221272233"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="495555989"/> <int key="NSTag">3</int> <bool key="NSEnabled">YES</bool> @@ -1388,11 +1412,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </array> <string key="NSFrame">{{2, 2}, {218, 73}}</string> <reference key="NSSuperview" ref="695086223"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="169562785"/> </object> </array> <string key="NSFrame">{{249, 106}, {222, 90}}</string> <reference key="NSSuperview" ref="613304714"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="221272233"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> @@ -1412,14 +1438,158 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSTitlePosition">2</int> <bool key="NSTransparent">NO</bool> </object> + <object class="NSBox" id="721006038"> + <reference key="NSNextResponder" ref="613304714"/> + <int key="NSvFlags">270</int> + <array class="NSMutableArray" key="NSSubviews"> + <object class="NSView" id="693248790"> + <reference key="NSNextResponder" ref="721006038"/> + <int key="NSvFlags">274</int> + <array class="NSMutableArray" key="NSSubviews"> + <object class="NSButton" id="155594978"> + <reference key="NSNextResponder" ref="693248790"/> + <int key="NSvFlags">259</int> + <string key="NSFrame">{{98, 7}, {111, 28}}</string> + <reference key="NSSuperview" ref="693248790"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="905819877"> + <int key="NSCellFlags">67108864</int> + <int key="NSCellFlags2">138018816</int> + <string key="NSContents">Configure</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="155594978"/> + <int key="NSButtonFlags">-2038284288</int> + <int key="NSButtonFlags2">1</int> + <reference key="NSAlternateImage" ref="694625424"/> + <string key="NSAlternateContents"/> + <object class="NSMutableString" key="NSKeyEquivalent"> + <characters key="NS.bytes"/> + </object> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + </object> + <object class="NSButton" id="524369892"> + <reference key="NSNextResponder" ref="693248790"/> + <int key="NSvFlags">262</int> + <string key="NSFrame">{{9, 7}, {90, 28}}</string> + <reference key="NSSuperview" ref="693248790"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="155594978"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="774833876"> + <int key="NSCellFlags">67108864</int> + <int key="NSCellFlags2">138018816</int> + <string key="NSContents">About</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="524369892"/> + <int key="NSButtonFlags">-2038284288</int> + <int key="NSButtonFlags2">1</int> + <reference key="NSAlternateImage" ref="694625424"/> + <string key="NSAlternateContents"/> + <object class="NSMutableString" key="NSKeyEquivalent"> + <characters key="NS.bytes"/> + </object> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + </object> + <object class="NSPopUpButton" id="341120868"> + <reference key="NSNextResponder" ref="693248790"/> + <int key="NSvFlags">258</int> + <string key="NSFrame">{{11, 35}, {196, 26}}</string> + <reference key="NSSuperview" ref="693248790"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="524369892"/> + <int key="NSTag">2</int> + <bool key="NSEnabled">YES</bool> + <object class="NSPopUpButtonCell" key="NSCell" id="777720704"> + <int key="NSCellFlags">-2076180416</int> + <int key="NSCellFlags2">1024</int> + <reference key="NSSupport" ref="113129670"/> + <reference key="NSControlView" ref="341120868"/> + <int key="NSButtonFlags">109199360</int> + <int key="NSButtonFlags2">1</int> + <reference key="NSAlternateImage" ref="983951697"/> + <object class="NSMutableString" key="NSAlternateContents"> + <characters key="NS.bytes"/> + </object> + <object class="NSMutableString" key="NSKeyEquivalent"> + <characters key="NS.bytes"/> + </object> + <int key="NSPeriodicDelay">400</int> + <int key="NSPeriodicInterval">75</int> + <nil key="NSMenuItem"/> + <bool key="NSMenuItemRespectAlignment">YES</bool> + <object class="NSMenu" key="NSMenu" id="771695632"> + <object class="NSMutableString" key="NSTitle"> + <characters key="NS.bytes">OtherViews</characters> + </object> + <array class="NSMutableArray" key="NSMenuItems"> + <object class="NSMenuItem" id="245690467"> + <reference key="NSMenu" ref="771695632"/> + <string key="NSTitle">Net Plugin</string> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="853204695"/> + <reference key="NSMixedImage" ref="607321304"/> + <string key="NSAction">_popUpItemAction:</string> + <reference key="NSTarget" ref="777720704"/> + </object> + </array> + </object> + <int key="NSSelectedIndex">-1</int> + <int key="NSPreferredEdge">3</int> + <bool key="NSUsesItemFromMenu">YES</bool> + <bool key="NSAltersState">YES</bool> + <int key="NSArrowPosition">1</int> + </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + </object> + </array> + <string key="NSFrame">{{2, 2}, {218, 73}}</string> + <reference key="NSSuperview" ref="721006038"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="341120868"/> + </object> + </array> + <string key="NSFrame">{{249, 12}, {222, 90}}</string> + <reference key="NSSuperview" ref="613304714"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="693248790"/> + <string key="NSOffsets">{0, 0}</string> + <object class="NSTextFieldCell" key="NSTitleCell"> + <int key="NSCellFlags">67108864</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">SIO1</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSBackgroundColor" ref="767300285"/> + <object class="NSColor" key="NSTextColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes> + </object> + </object> + <reference key="NSContentView" ref="693248790"/> + <int key="NSBorderType">3</int> + <int key="NSBoxType">0</int> + <int key="NSTitlePosition">2</int> + <bool key="NSTransparent">NO</bool> + </object> </array> <string key="NSFrameSize">{472, 293}</string> <reference key="NSSuperview" ref="30192545"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="711664786"/> </object> </array> <string key="NSFrame">{{17, 2}, {472, 293}}</string> <reference key="NSSuperview" ref="494923943"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="613304714"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> @@ -1441,6 +1611,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> </array> <string key="NSFrame">{{10, 33}, {506, 298}}</string> + <reference key="NSSuperview" ref="145760790"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="30192545"/> </object> <string key="NSLabel">Plugins</string> @@ -1714,7 +1886,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <object class="NSTabViewItem" id="185355004"> <string key="NSIdentifier">4</string> <object class="NSView" key="NSView" id="958294119"> - <reference key="NSNextResponder" ref="145760790"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> <array class="NSMutableArray" key="NSSubviews"> <object class="NSButton" id="195305356"> @@ -1722,7 +1894,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{-3, 267}, {121, 32}}</string> <reference key="NSSuperview" ref="958294119"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="911328747"/> <string key="NSReuseIdentifierKey">_NS:9</string> <int key="NSTag">100</int> @@ -1750,7 +1921,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{120, 273}, {310, 22}}</string> <reference key="NSSuperview" ref="958294119"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="168188758"/> <string key="NSReuseIdentifierKey">_NS:9</string> <bool key="NSEnabled">YES</bool> @@ -1782,7 +1952,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{-3, 237}, {121, 32}}</string> <reference key="NSSuperview" ref="958294119"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="823878691"/> <string key="NSReuseIdentifierKey">_NS:9</string> <int key="NSTag">101</int> @@ -1810,7 +1979,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{120, 243}, {310, 22}}</string> <reference key="NSSuperview" ref="958294119"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="795957481"/> <string key="NSReuseIdentifierKey">_NS:9</string> <bool key="NSEnabled">YES</bool> @@ -1837,7 +2005,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{-3, 205}, {121, 32}}</string> <reference key="NSSuperview" ref="958294119"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="341191480"/> <string key="NSReuseIdentifierKey">_NS:9</string> <int key="NSTag">102</int> @@ -1865,7 +2032,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{120, 212}, {310, 22}}</string> <reference key="NSSuperview" ref="958294119"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="659547625"/> <string key="NSReuseIdentifierKey">_NS:9</string> <bool key="NSEnabled">YES</bool> @@ -1892,7 +2058,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{-3, 173}, {121, 32}}</string> <reference key="NSSuperview" ref="958294119"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="364881091"/> <string key="NSReuseIdentifierKey">_NS:9</string> <int key="NSTag">103</int> @@ -1920,7 +2085,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{120, 180}, {310, 22}}</string> <reference key="NSSuperview" ref="958294119"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="246038820"/> <string key="NSReuseIdentifierKey">_NS:9</string> <bool key="NSEnabled">YES</bool> @@ -1947,7 +2111,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{-3, 141}, {121, 32}}</string> <reference key="NSSuperview" ref="958294119"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="1072290452"/> <string key="NSReuseIdentifierKey">_NS:9</string> <int key="NSTag">104</int> @@ -1975,7 +2138,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{120, 148}, {310, 22}}</string> <reference key="NSSuperview" ref="958294119"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="860331374"/> <string key="NSReuseIdentifierKey">_NS:9</string> <bool key="NSEnabled">YES</bool> @@ -2002,7 +2164,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{-3, 109}, {121, 32}}</string> <reference key="NSSuperview" ref="958294119"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="205239960"/> <string key="NSReuseIdentifierKey">_NS:9</string> <int key="NSTag">105</int> @@ -2030,7 +2191,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{120, 117}, {310, 22}}</string> <reference key="NSSuperview" ref="958294119"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="32956648"/> <string key="NSReuseIdentifierKey">_NS:9</string> <bool key="NSEnabled">YES</bool> @@ -2057,7 +2217,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSvFlags">42</int> <string key="NSFrame">{{3, 101}, {500, 5}}</string> <reference key="NSSuperview" ref="958294119"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="267389414"/> <string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSOffsets">{0, 0}</string> @@ -2082,7 +2241,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{0, 78}, {113, 17}}</string> <reference key="NSSuperview" ref="958294119"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="465452774"/> <string key="NSReuseIdentifierKey">_NS:1535</string> <bool key="NSEnabled">YES</bool> @@ -2103,7 +2261,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <int key="NSvFlags">268</int> <string key="NSFrame">{{117, 72}, {153, 26}}</string> <reference key="NSSuperview" ref="958294119"/> - <reference key="NSWindow"/> <string key="NSReuseIdentifierKey">_NS:9</string> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="465026198"> @@ -2180,8 +2337,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> </array> <string key="NSFrame">{{10, 33}, {506, 298}}</string> - <reference key="NSSuperview" ref="145760790"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="195305356"/> </object> <string key="NSLabel">Hotkeys</string> @@ -2189,13 +2344,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference key="NSTabView" ref="145760790"/> </object> </array> - <reference key="NSSelectedTabViewItem" ref="185355004"/> + <reference key="NSSelectedTabViewItem" ref="869045919"/> <reference key="NSFont" ref="113129670"/> <int key="NSTvFlags">0</int> <bool key="NSAllowTruncatedLabels">YES</bool> <bool key="NSDrawsBackground">YES</bool> <array class="NSMutableArray" key="NSSubviews"> - <reference ref="958294119"/> + <reference ref="494923943"/> </array> </object> </array> @@ -2224,6 +2379,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <object class="NSCustomObject" id="248585311"> <string key="NSClassName">PluginController</string> </object> + <object class="NSCustomObject" id="251882331"> + <string key="NSClassName">PluginController</string> + </object> </array> <object class="IBObjectContainer" key="IBDocument.Objects"> <array class="NSMutableArray" key="connectionRecords"> @@ -2509,6 +2667,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> + <string key="label">sio1Plugin</string> + <reference key="source" ref="974938689"/> + <reference key="destination" ref="251882331"/> + </object> + <int key="connectionID">915</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> <string key="label">delegate</string> <reference key="source" ref="379363543"/> <reference key="destination" ref="974938689"/> @@ -2859,6 +3025,54 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> <int key="connectionID">901</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">aboutButton</string> + <reference key="source" ref="251882331"/> + <reference key="destination" ref="524369892"/> + </object> + <int key="connectionID">916</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">configureButton</string> + <reference key="source" ref="251882331"/> + <reference key="destination" ref="155594978"/> + </object> + <int key="connectionID">917</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">pluginMenu</string> + <reference key="source" ref="251882331"/> + <reference key="destination" ref="341120868"/> + </object> + <int key="connectionID">918</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">doAbout:</string> + <reference key="source" ref="251882331"/> + <reference key="destination" ref="524369892"/> + </object> + <int key="connectionID">919</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">doConfigure:</string> + <reference key="source" ref="251882331"/> + <reference key="destination" ref="155594978"/> + </object> + <int key="connectionID">920</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">selectPlugin:</string> + <reference key="source" ref="251882331"/> + <reference key="destination" ref="341120868"/> + </object> + <int key="connectionID">921</int> + </object> </array> <object class="IBMutableOrderedSet" key="objectRecords"> <array key="orderedObjects"> @@ -2976,6 +3190,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference ref="490231628"/> <reference ref="695086223"/> <reference ref="950422833"/> + <reference ref="721006038"/> </array> <reference key="parent" ref="494923943"/> </object> @@ -3885,6 +4100,77 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference key="object" ref="548509436"/> <reference key="parent" ref="168188758"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">902</int> + <reference key="object" ref="721006038"/> + <array class="NSMutableArray" key="children"> + <reference ref="155594978"/> + <reference ref="524369892"/> + <reference ref="341120868"/> + </array> + <reference key="parent" ref="30192545"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">903</int> + <reference key="object" ref="155594978"/> + <array class="NSMutableArray" key="children"> + <reference ref="905819877"/> + </array> + <reference key="parent" ref="721006038"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">904</int> + <reference key="object" ref="524369892"/> + <array class="NSMutableArray" key="children"> + <reference ref="774833876"/> + </array> + <reference key="parent" ref="721006038"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">905</int> + <reference key="object" ref="341120868"/> + <array class="NSMutableArray" key="children"> + <reference ref="777720704"/> + </array> + <reference key="parent" ref="721006038"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">906</int> + <reference key="object" ref="777720704"/> + <array class="NSMutableArray" key="children"> + <reference ref="771695632"/> + </array> + <reference key="parent" ref="341120868"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">907</int> + <reference key="object" ref="771695632"/> + <array class="NSMutableArray" key="children"> + <reference ref="245690467"/> + </array> + <reference key="parent" ref="777720704"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">908</int> + <reference key="object" ref="245690467"/> + <reference key="parent" ref="771695632"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">909</int> + <reference key="object" ref="774833876"/> + <reference key="parent" ref="524369892"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">910</int> + <reference key="object" ref="905819877"/> + <reference key="parent" ref="155594978"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">914</int> + <reference key="object" ref="251882331"/> + <reference key="parent" ref="0"/> + <string key="objectName">Sio1 Plugin</string> + </object> </array> </object> <dictionary class="NSMutableDictionary" key="flattenedProperties"> @@ -4102,12 +4388,22 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string key="897.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="898.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="899.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="902.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="903.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="904.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="905.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="906.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="907.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="908.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="909.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="910.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="914.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> </dictionary> <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/> <nil key="activeLocalization"/> <dictionary class="NSMutableDictionary" key="localizations"/> <nil key="sourceID"/> - <int key="maxID">901</int> + <int key="maxID">921</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <array class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -4165,6 +4461,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string key="noXaAudioCell">id</string> <string key="padPlugin">PluginController</string> <string key="rCountFixCell">id</string> + <string key="sio1Plugin">PluginController</string> <string key="sioIrqAlwaysCell">id</string> <string key="soundPlugin">PluginController</string> <string key="spuIrqAlwaysCell">id</string> @@ -4239,6 +4536,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string key="name">rCountFixCell</string> <string key="candidateClassName">id</string> </object> + <object class="IBToOneOutletInfo" key="sio1Plugin"> + <string key="name">sio1Plugin</string> + <string key="candidateClassName">PluginController</string> + </object> <object class="IBToOneOutletInfo" key="sioIrqAlwaysCell"> <string key="name">sioIrqAlwaysCell</string> <string key="candidateClassName">id</string> @@ -4331,79 +4632,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> </object> <object class="IBPartialClassDescription"> - <string key="className">NamedSlider</string> - <string key="superclassName">NSSlider</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">./Classes/NamedSlider.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> <string key="className">PluginController</string> <string key="superclassName">NSObject</string> - <dictionary class="NSMutableDictionary" key="actions"> - <string key="cancel:">id</string> - <string key="ok:">id</string> - <string key="reset:">id</string> - </dictionary> - <dictionary class="NSMutableDictionary" key="actionInfosByName"> - <object class="IBActionInfo" key="cancel:"> - <string key="name">cancel:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo" key="ok:"> - <string key="name">ok:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo" key="reset:"> - <string key="name">reset:</string> - <string key="candidateClassName">id</string> - </object> - </dictionary> - <dictionary class="NSMutableDictionary" key="outlets"> - <string key="hiCompBox">NSControl</string> - <string key="interpolValue">NamedSlider</string> - <string key="irqWaitBox">NSControl</string> - <string key="monoSoundBox">NSControl</string> - <string key="reverbValue">NamedSlider</string> - <string key="volumeValue">NamedSlider</string> - <string key="xaEnableBox">NSControl</string> - <string key="xaSpeedBox">NSControl</string> - </dictionary> - <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName"> - <object class="IBToOneOutletInfo" key="hiCompBox"> - <string key="name">hiCompBox</string> - <string key="candidateClassName">NSControl</string> - </object> - <object class="IBToOneOutletInfo" key="interpolValue"> - <string key="name">interpolValue</string> - <string key="candidateClassName">NamedSlider</string> - </object> - <object class="IBToOneOutletInfo" key="irqWaitBox"> - <string key="name">irqWaitBox</string> - <string key="candidateClassName">NSControl</string> - </object> - <object class="IBToOneOutletInfo" key="monoSoundBox"> - <string key="name">monoSoundBox</string> - <string key="candidateClassName">NSControl</string> - </object> - <object class="IBToOneOutletInfo" key="reverbValue"> - <string key="name">reverbValue</string> - <string key="candidateClassName">NamedSlider</string> - </object> - <object class="IBToOneOutletInfo" key="volumeValue"> - <string key="name">volumeValue</string> - <string key="candidateClassName">NamedSlider</string> - </object> - <object class="IBToOneOutletInfo" key="xaEnableBox"> - <string key="name">xaEnableBox</string> - <string key="candidateClassName">NSControl</string> - </object> - <object class="IBToOneOutletInfo" key="xaSpeedBox"> - <string key="name">xaSpeedBox</string> - <string key="candidateClassName">NSControl</string> - </object> - </dictionary> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">./Classes/PluginController.h</string> diff --git a/macosx/Pcsxr-Debug.xcconfig b/macosx/Pcsxr-Debug.xcconfig new file mode 100644 index 00000000..c312891f --- /dev/null +++ b/macosx/Pcsxr-Debug.xcconfig @@ -0,0 +1,11 @@ +DEBUG_PREPROCESSOR_DEFINITIONS = DEBUG=1 +#include "Pcsxr.xcconfig" + +GCC_GENERATE_DEBUGGING_SYMBOLS = YES +GCC_INLINES_ARE_PRIVATE_EXTERN = NO +GCC_OPTIMIZATION_LEVEL = 0 +GCC_SYMBOLS_PRIVATE_EXTERN = NO +GCC_UNROLL_LOOPS = NO +ONLY_ACTIVE_ARCH = YES +GCC_DYNAMIC_NO_PIC = NO +COPY_PHASE_STRIP = NO diff --git a/macosx/Pcsxr-Instrument.xcconfig b/macosx/Pcsxr-Instrument.xcconfig new file mode 100644 index 00000000..b26010e6 --- /dev/null +++ b/macosx/Pcsxr-Instrument.xcconfig @@ -0,0 +1,5 @@ + +#include "Pcsxr-Release.xcconfig" + +//:configuration = Debug +COPY_PHASE_STRIP = NO diff --git a/macosx/Pcsxr-Release.xcconfig b/macosx/Pcsxr-Release.xcconfig new file mode 100644 index 00000000..6f3a9404 --- /dev/null +++ b/macosx/Pcsxr-Release.xcconfig @@ -0,0 +1,11 @@ +DEBUG_PREPROCESSOR_DEFINITIONS = + +#include "Pcsxr.xcconfig" + +GCC_GENERATE_DEBUGGING_SYMBOLS = NO +GCC_INLINES_ARE_PRIVATE_EXTERN = YES +GCC_OPTIMIZATION_LEVEL = s +GCC_SYMBOLS_PRIVATE_EXTERN = YES +GCC_UNROLL_LOOPS = YES +GCC_DYNAMIC_NO_PIC = YES +COPY_PHASE_STRIP = YES diff --git a/macosx/Pcsxr.xcconfig b/macosx/Pcsxr.xcconfig new file mode 100644 index 00000000..36742453 --- /dev/null +++ b/macosx/Pcsxr.xcconfig @@ -0,0 +1,17 @@ +// +// Pcsxr.xcconfig +// Pcsxr +// +// Created by C.W. Betts on 7/4/13. +// +// + + +ARCHS = $(ARCHS_STANDARD_32_64_BIT) +SDKROOT = macosx +GCC_PREPROCESSOR_DEFINITIONS = _MACOSX=1 $(DEBUG_PREPROCESSOR_DEFINITIONS) +DEBUG_INFORMATION_FORMAT = dwarf-with-dsym +GCC_VERSION = com.apple.compilers.llvm.clang.1_0 +MACOSX_DEPLOYMENT_TARGET = 10.6 +VALID_ARCHS = i386 x86_64 +CLANG_ENABLE_OBJC_ARC[arch=x86_64] = YES diff --git a/macosx/Pcsxr.xcodeproj/project.pbxproj b/macosx/Pcsxr.xcodeproj/project.pbxproj index 7139274a..33529820 100644 --- a/macosx/Pcsxr.xcodeproj/project.pbxproj +++ b/macosx/Pcsxr.xcodeproj/project.pbxproj @@ -31,6 +31,8 @@ 2BB3D6C605427FE200831ACB /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BC4786204C7FD3600CAB520 /* Cocoa.framework */; }; 2BB3D6C805427FE200831ACB /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B6E8AB404C8327C0017A3B1 /* IOKit.framework */; }; 5529EA11169CBE3400BAA2A5 /* RecentItemsMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 5550D2721683C923006C56B5 /* RecentItemsMenu.m */; }; + 55858D24178632C50068B8FC /* Bladesio1.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 55858D201786329D0068B8FC /* Bladesio1.psxplugin */; }; + 55858D2917864D140068B8FC /* Pcsxr.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 55858D2817864D140068B8FC /* Pcsxr.xcconfig */; }; 5586CD9714AFADD9008EF4EE /* PeopsSpuSDL.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 71AD2DD110C356FD00365243 /* PeopsSpuSDL.psxplugin */; }; 5586CD9814AFADD9008EF4EE /* PeopsSpuAL.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 28B467F11463D0020083F129 /* PeopsSpuAL.psxplugin */; }; 559366CA12B694DF004ACC1E /* iR3000A-64.c in Sources */ = {isa = PBXBuildFile; fileRef = 559366C112B694DF004ACC1E /* iR3000A-64.c */; }; @@ -55,8 +57,8 @@ 713CB2E411FC49DA0033B6A8 /* DFCdrom.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 71F93F6C11FB8E9D007A5A7C /* DFCdrom.psxplugin */; }; 7192F42A129C412E0042D946 /* gpu.c in Sources */ = {isa = PBXBuildFile; fileRef = 7192F428129C412E0042D946 /* gpu.c */; }; 719594B211AEFE8C004AD686 /* psxcommon.c in Sources */ = {isa = PBXBuildFile; fileRef = 719594B011AEFE8C004AD686 /* psxcommon.c */; }; - 71AD2DF510C3575C00365243 /* PeopsSoftGL.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 71AD2DDC10C3570900365243 /* PeopsSoftGL.psxplugin */; }; - 71D888D6130F04F100F150FF /* PeopsXGL.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 71D888D4130F04DC00F150FF /* PeopsXGL.psxplugin */; }; + 71AD2DF510C3575C00365243 /* gpuPeopsSoftGL.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 71AD2DDC10C3570900365243 /* gpuPeopsSoftGL.psxplugin */; }; + 71D888D6130F04F100F150FF /* gpuPeopsXGL.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 71D888D4130F04DC00F150FF /* gpuPeopsXGL.psxplugin */; }; 71F2C0881200B6B000322AD9 /* DFInput.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 71F2C0861200B69B00322AD9 /* DFInput.psxplugin */; }; 71F4C5890FDED12800529849 /* cdriso.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5600FDED12800529849 /* cdriso.c */; }; 71F4C58B0FDED12800529849 /* cdrom.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5620FDED12800529849 /* cdrom.c */; }; @@ -113,6 +115,20 @@ remoteGlobalIDString = 5599695E13AFCD2900B0216B; remoteInfo = PeopsAL; }; + 55858D1F1786329D0068B8FC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 55858D1B1786329D0068B8FC /* Bladesio1.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8D576316048677EA00EA77CD; + remoteInfo = Bladesio1; + }; + 55858D22178632B70068B8FC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 55858D1B1786329D0068B8FC /* Bladesio1.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8D57630D048677EA00EA77CD; + remoteInfo = Bladesio1; + }; 5586005E17850CFC00CB3D85 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 71AD2DC710C356FD00365243 /* PeopsSPU.xcodeproj */; @@ -220,13 +236,14 @@ dstPath = ""; dstSubfolderSpec = 13; files = ( + 55858D24178632C50068B8FC /* Bladesio1.psxplugin in Copy PlugIns */, 5586CD9714AFADD9008EF4EE /* PeopsSpuSDL.psxplugin in Copy PlugIns */, 5586CD9814AFADD9008EF4EE /* PeopsSpuAL.psxplugin in Copy PlugIns */, 559DACBB146C68C500C5DF71 /* DFNet.psxplugin in Copy PlugIns */, - 71D888D6130F04F100F150FF /* PeopsXGL.psxplugin in Copy PlugIns */, + 71D888D6130F04F100F150FF /* gpuPeopsXGL.psxplugin in Copy PlugIns */, 71F2C0881200B6B000322AD9 /* DFInput.psxplugin in Copy PlugIns */, 713CB2E411FC49DA0033B6A8 /* DFCdrom.psxplugin in Copy PlugIns */, - 71AD2DF510C3575C00365243 /* PeopsSoftGL.psxplugin in Copy PlugIns */, + 71AD2DF510C3575C00365243 /* gpuPeopsSoftGL.psxplugin in Copy PlugIns */, ); name = "Copy PlugIns"; runOnlyForDeploymentPostprocessing = 0; @@ -272,6 +289,11 @@ 2BC4786204C7FD3600CAB520 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; }; 5550D2711683C923006C56B5 /* RecentItemsMenu.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RecentItemsMenu.h; sourceTree = "<group>"; }; 5550D2721683C923006C56B5 /* RecentItemsMenu.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RecentItemsMenu.m; sourceTree = "<group>"; }; + 55858D1B1786329D0068B8FC /* Bladesio1.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Bladesio1.xcodeproj; path = plugins/Bladesio1/Bladesio1.xcodeproj; sourceTree = "<group>"; }; + 55858D2817864D140068B8FC /* Pcsxr.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Pcsxr.xcconfig; sourceTree = SOURCE_ROOT; }; + 55858D2A17864DC80068B8FC /* Pcsxr-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Pcsxr-Debug.xcconfig"; sourceTree = SOURCE_ROOT; }; + 55858D2B17864DC90068B8FC /* Pcsxr-Instrument.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Pcsxr-Instrument.xcconfig"; sourceTree = SOURCE_ROOT; }; + 55858D2C17864DC90068B8FC /* Pcsxr-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Pcsxr-Release.xcconfig"; sourceTree = SOURCE_ROOT; }; 559366C012B694DF004ACC1E /* iGte.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iGte.h; sourceTree = "<group>"; }; 559366C112B694DF004ACC1E /* iR3000A-64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "iR3000A-64.c"; sourceTree = "<group>"; }; 559366C212B694DF004ACC1E /* ix86-64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "ix86-64.c"; sourceTree = "<group>"; }; @@ -449,6 +471,10 @@ 28F0C3CA146521B700A90285 /* AddPluginSheet.xib */, 55A90221147D7C7A0037E18F /* MemCardManager.xib */, 55C7A216148B2B3800C22ABC /* PcsxrMemCardDocument.xib */, + 55858D2A17864DC80068B8FC /* Pcsxr-Debug.xcconfig */, + 55858D2B17864DC90068B8FC /* Pcsxr-Instrument.xcconfig */, + 55858D2C17864DC90068B8FC /* Pcsxr-Release.xcconfig */, + 55858D2817864D140068B8FC /* Pcsxr.xcconfig */, ); name = Resources; path = English.lproj; @@ -457,6 +483,7 @@ 2BBD6C1D04C893F500A83E33 /* PlugIns */ = { isa = PBXGroup; children = ( + 55858D1B1786329D0068B8FC /* Bladesio1.xcodeproj */, 559DACA3146C647E00C5DF71 /* DFNet.xcodeproj */, 71D888CE130F04DC00F150FF /* PeopsXGL.xcodeproj */, 71F2C07E1200B69B00322AD9 /* DFInput.xcodeproj */, @@ -575,6 +602,14 @@ path = ../libpcsxcore; sourceTree = "<group>"; }; + 55858D1C1786329D0068B8FC /* Products */ = { + isa = PBXGroup; + children = ( + 55858D201786329D0068B8FC /* Bladesio1.psxplugin */, + ); + name = Products; + sourceTree = "<group>"; + }; 559366BF12B694DF004ACC1E /* ix86_64 */ = { isa = PBXGroup; children = ( @@ -612,7 +647,7 @@ 71AD2DD810C3570900365243 /* Products */ = { isa = PBXGroup; children = ( - 71AD2DDC10C3570900365243 /* PeopsSoftGL.psxplugin */, + 71AD2DDC10C3570900365243 /* gpuPeopsSoftGL.psxplugin */, ); name = Products; sourceTree = "<group>"; @@ -620,7 +655,7 @@ 71D888CF130F04DC00F150FF /* Products */ = { isa = PBXGroup; children = ( - 71D888D4130F04DC00F150FF /* PeopsXGL.psxplugin */, + 71D888D4130F04DC00F150FF /* gpuPeopsXGL.psxplugin */, ); name = Products; sourceTree = "<group>"; @@ -669,6 +704,7 @@ 2BB3D6D005427FE200831ACB /* PBXBuildRule */, ); dependencies = ( + 55858D23178632B70068B8FC /* PBXTargetDependency */, 559DACBA146C68B700C5DF71 /* PBXTargetDependency */, 559DAC46146BA61400C5DF71 /* PBXTargetDependency */, 71AD2DE910C3572200365243 /* PBXTargetDependency */, @@ -705,6 +741,10 @@ projectDirPath = ""; projectReferences = ( { + ProductGroup = 55858D1C1786329D0068B8FC /* Products */; + ProjectRef = 55858D1B1786329D0068B8FC /* Bladesio1.xcodeproj */; + }, + { ProductGroup = 71F93F6411FB8E9D007A5A7C /* Products */; ProjectRef = 71F93F6311FB8E9D007A5A7C /* DFCdrom.xcodeproj */; }, @@ -744,6 +784,13 @@ remoteRef = 28B467F01463D0020083F129 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 55858D201786329D0068B8FC /* Bladesio1.psxplugin */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = Bladesio1.psxplugin; + remoteRef = 55858D1F1786329D0068B8FC /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 5586005F17850CFC00CB3D85 /* libSPUSharedCode.dylib */ = { isa = PBXReferenceProxy; fileType = "compiled.mach-o.dylib"; @@ -765,17 +812,17 @@ remoteRef = 71AD2DD010C356FD00365243 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 71AD2DDC10C3570900365243 /* PeopsSoftGL.psxplugin */ = { + 71AD2DDC10C3570900365243 /* gpuPeopsSoftGL.psxplugin */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; - path = PeopsSoftGL.psxplugin; + path = gpuPeopsSoftGL.psxplugin; remoteRef = 71AD2DDB10C3570900365243 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 71D888D4130F04DC00F150FF /* PeopsXGL.psxplugin */ = { + 71D888D4130F04DC00F150FF /* gpuPeopsXGL.psxplugin */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; - path = PeopsXGL.psxplugin; + path = gpuPeopsXGL.psxplugin; remoteRef = 71D888D3130F04DC00F150FF /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -815,6 +862,7 @@ 55C7A214148B2B3800C22ABC /* PcsxrMemCardDocument.xib in Resources */, 02FE55E816765F9400205CF2 /* KeyNames.plist in Resources */, D422E66E16DC48D000526DCF /* CheatWindow.xib in Resources */, + 55858D2917864D140068B8FC /* Pcsxr.xcconfig in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -881,6 +929,11 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + 55858D23178632B70068B8FC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = Bladesio1; + targetProxy = 55858D22178632B70068B8FC /* PBXContainerItemProxy */; + }; 559DAC46146BA61400C5DF71 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = PeopsAL; @@ -1004,29 +1057,78 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - 71F353F40FD98DFE00CBEC28 /* Debug */ = { + 55858D2D1786522D0068B8FC /* Instrument */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 55858D2B17864DC90068B8FC /* Pcsxr-Instrument.xcconfig */; + buildSettings = { + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ( + ../include, + ../libpcsxcore, + ../macosx, + ); + MACOSX_DEPLOYMENT_TARGET = 10.7; + OTHER_CFLAGS = "-fomit-frame-pointer"; + OTHER_LDFLAGS = "-lz"; + }; + name = Instrument; + }; + 55858D2E1786522D0068B8FC /* Instrument */ = { isa = XCBuildConfiguration; buildSettings = { - "CLANG_ENABLE_OBJC_ARC[arch=x86_64]" = YES; COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_ASM_KEYWORD = YES; GCC_ENABLE_CPP_EXCEPTIONS = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( PCSXRCORE, "PCSXR_VERSION=\\\"1.5\\\"", "XA_HACK=1", "_MACOSX=1", __MACOSX__, + "ENABLE_SIO1API=1", + "$(inherited)", + ); + GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; + GCC_WARN_UNKNOWN_PRAGMAS = NO; + INFOPLIST_FILE = Info.plist; + OTHER_CFLAGS = ( + "-funroll-loops", + "-falign-loops=16", + "$(inherited)", + ); + PRODUCT_NAME = PCSXR; + WRAPPER_EXTENSION = app; + }; + name = Instrument; + }; + 71F353F40FD98DFE00CBEC28 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + COMBINE_HIDPI_IMAGES = YES; + GCC_ENABLE_ASM_KEYWORD = YES; + GCC_ENABLE_CPP_EXCEPTIONS = NO; + GCC_PREPROCESSOR_DEFINITIONS = ( + PCSXRCORE, + "PCSXR_VERSION=\\\"1.5\\\"", + "XA_HACK=1", + __MACOSX__, + "ENABLE_SIO1API=1", "$(inherited)", ); GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = Info.plist; - OTHER_CFLAGS = "-falign-loops=16"; + OTHER_CFLAGS = ( + "-falign-loops=16", + "$(inherited)", + ); PRODUCT_NAME = PCSXR; WRAPPER_EXTENSION = app; }; @@ -1035,29 +1137,25 @@ 71F353F50FD98DFE00CBEC28 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - "CLANG_ENABLE_OBJC_ARC[arch=x86_64]" = YES; COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = YES; - GCC_DYNAMIC_NO_PIC = YES; GCC_ENABLE_ASM_KEYWORD = YES; GCC_ENABLE_CPP_EXCEPTIONS = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_OPTIMIZATION_LEVEL = s; GCC_PREPROCESSOR_DEFINITIONS = ( PCSXRCORE, "PCSXR_VERSION=\\\"1.5\\\"", "XA_HACK=1", "_MACOSX=1", __MACOSX__, + "ENABLE_SIO1API=1", "$(inherited)", ); GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; GCC_WARN_UNKNOWN_PRAGMAS = NO; INFOPLIST_FILE = Info.plist; OTHER_CFLAGS = ( - "-fomit-frame-pointer", "-funroll-loops", "-falign-loops=16", + "$(inherited)", ); PRODUCT_NAME = PCSXR; WRAPPER_EXTENSION = app; @@ -1066,16 +1164,12 @@ }; 71F353F90FD98DFE00CBEC28 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 55858D2A17864DC80068B8FC /* Pcsxr-Debug.xcconfig */; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - DEBUG_INFORMATION_FORMAT = dwarf; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; @@ -1086,29 +1180,18 @@ ../macosx, ); MACOSX_DEPLOYMENT_TARGET = 10.7; - ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-lz"; - SDKROOT = macosx; - VALID_ARCHS = "i386 x86_64"; }; name = Debug; }; 71F353FA0FD98DFE00CBEC28 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 55858D2C17864DC90068B8FC /* Pcsxr-Release.xcconfig */; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_DYNAMIC_NO_PIC = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_INLINES_ARE_PRIVATE_EXTERN = YES; - GCC_OPTIMIZATION_LEVEL = 2; - GCC_SYMBOLS_PRIVATE_EXTERN = YES; - GCC_UNROLL_LOOPS = YES; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; @@ -1121,8 +1204,6 @@ MACOSX_DEPLOYMENT_TARGET = 10.7; OTHER_CFLAGS = "-fomit-frame-pointer"; OTHER_LDFLAGS = "-lz"; - SDKROOT = macosx; - VALID_ARCHS = "i386 x86_64"; }; name = Release; }; @@ -1134,6 +1215,7 @@ buildConfigurations = ( 71F353F40FD98DFE00CBEC28 /* Debug */, 71F353F50FD98DFE00CBEC28 /* Release */, + 55858D2E1786522D0068B8FC /* Instrument */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1143,6 +1225,7 @@ buildConfigurations = ( 71F353F90FD98DFE00CBEC28 /* Debug */, 71F353FA0FD98DFE00CBEC28 /* Release */, + 55858D2D1786522D0068B8FC /* Instrument */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/macosx/Pcsxr.xcworkspace/contents.xcworkspacedata b/macosx/Pcsxr.xcworkspace/contents.xcworkspacedata index 7eabe339..1d41bc64 100644 --- a/macosx/Pcsxr.xcworkspace/contents.xcworkspacedata +++ b/macosx/Pcsxr.xcworkspace/contents.xcworkspacedata @@ -19,4 +19,10 @@ <FileRef location = "group:plugins/DFSound/PeopsSPU.xcodeproj"> </FileRef> + <FileRef + location = "group:plugins/DFNet/DFNet.xcodeproj"> + </FileRef> + <FileRef + location = "group:plugins/Bladesio1/Bladesio1.xcodeproj"> + </FileRef> </Workspace> diff --git a/macosx/PcsxrController.m b/macosx/PcsxrController.m index 8ac16e1c..b254a215 100755 --- a/macosx/PcsxrController.m +++ b/macosx/PcsxrController.m @@ -654,6 +654,7 @@ otherblock();\ [NSValue valueWithPointer:Config.Pad1], @"PluginPAD", [NSValue valueWithPointer:Config.Cdr], @"PluginCDR", [NSValue valueWithPointer:Config.Net], @"PluginNET", + [NSValue valueWithPointer:Config.Sio1], @"PluginSIO1", nil]; prefURLKeys = [[NSDictionary alloc] initWithObjectsAndKeys: diff --git a/macosx/PcsxrMemoryObject.m b/macosx/PcsxrMemoryObject.m index e85145b2..4d740b30 100755 --- a/macosx/PcsxrMemoryObject.m +++ b/macosx/PcsxrMemoryObject.m @@ -123,15 +123,17 @@ NSString *const memoryAnimateTimerKey = @"PCSXR Memory Card Image Animate"; return; } //This is the only setter that is being watched AND changed. - [self willChangeValueForKey:@"memImage"]; #if __has_feature(objc_arc) + [self willChangeValueForKey:@"memImage"]; memImage = theMemImage; + [self didChangeValueForKey:@"memImage"]; #else NSImage *tmpImage = memImage; + [self willChangeValueForKey:@"memImage"]; memImage = [theMemImage retain]; + [self didChangeValueForKey:@"memImage"]; [tmpImage release]; #endif - [self didChangeValueForKey:@"memImage"]; } - (NSImage*)memImage { diff --git a/macosx/PcsxrPlugin.m b/macosx/PcsxrPlugin.m index 8fdd0763..958d493d 100755 --- a/macosx/PcsxrPlugin.m +++ b/macosx/PcsxrPlugin.m @@ -22,6 +22,7 @@ case PSE_LT_SPU: return @"SPU"; break; case PSE_LT_PAD: return @"PAD"; break; case PSE_LT_NET: return @"NET"; break; + case PSE_LT_SIO1: return @"SIO1"; break; } return @""; @@ -36,6 +37,7 @@ case PSE_LT_SPU: case PSE_LT_PAD: case PSE_LT_NET: + case PSE_LT_SIO1: return [NSString stringWithFormat:@"Plugin%@", [self prefixForType:aType]]; break; default: @@ -51,6 +53,8 @@ static char *spu[2] = {(char *)&Config.Spu, NULL}; static char *pad[3] = {(char *)&Config.Pad1, (char *)&Config.Pad2, NULL}; static char *net[2] = {(char *)&Config.Net, NULL}; + static char *sio1[2] = {(char *)&Config.Sio1, NULL}; + switch (aType) { case PSE_LT_GPU: return (char **)gpu; @@ -58,6 +62,7 @@ case PSE_LT_SPU: return (char **)spu; case PSE_LT_PAD: return (char **)pad; case PSE_LT_NET: return (char **)net; + case PSE_LT_SIO1: return (char **)sio1; } return nil; @@ -168,13 +173,15 @@ type = PSE_LT_PAD; else if (([path rangeOfString: @"net" options:NSCaseInsensitiveSearch]).length != 0) type = PSE_LT_NET; + else if (([path rangeOfString: @"sio1" options:NSCaseInsensitiveSearch]).length != 0) + type = PSE_LT_SIO1; else { AUTORELEASEOBJNORETURN(self); return nil; } } else { type = (int)PSE_getLibType(); - if (type != PSE_LT_GPU && type != PSE_LT_CDR && type != PSE_LT_SPU && type != PSE_LT_PAD && type != PSE_LT_NET) { + if (type != PSE_LT_GPU && type != PSE_LT_CDR && type != PSE_LT_SPU && type != PSE_LT_PAD && type != PSE_LT_NET && type != PSE_LT_SIO1) { AUTORELEASEOBJNORETURN(self); return nil; } diff --git a/macosx/PluginList.h b/macosx/PluginList.h index 9e6107d0..6e55f157 100755 --- a/macosx/PluginList.h +++ b/macosx/PluginList.h @@ -20,6 +20,7 @@ PcsxrPlugin *activeCdrPlugin; PcsxrPlugin *activePadPlugin; PcsxrPlugin *activeNetPlugin; + PcsxrPlugin *activeSIO1Plugin; BOOL missingPlugins; } 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 diff --git a/macosx/plugins/Bladesio1/Bladesio1.xcodeproj/project.pbxproj b/macosx/plugins/Bladesio1/Bladesio1.xcodeproj/project.pbxproj index a4b46c3a..956daf4e 100644 --- a/macosx/plugins/Bladesio1/Bladesio1.xcodeproj/project.pbxproj +++ b/macosx/plugins/Bladesio1/Bladesio1.xcodeproj/project.pbxproj @@ -34,7 +34,6 @@ 28586CC514651E870082B8EC /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Bladesio1PluginConfig.xib; sourceTree = "<group>"; }; 2BD707170555997500CB5D9B /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; }; 552E4CBB1474737A00FB231F /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = "<group>"; }; - 55858D0A178609A80068B8FC /* cfg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cfg.c; sourceTree = "<group>"; }; 55858D0B178609A80068B8FC /* connection.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = connection.c; sourceTree = "<group>"; }; 55858D0C178609A80068B8FC /* connection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = connection.h; sourceTree = "<group>"; }; 55858D0D178609A80068B8FC /* fifo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fifo.c; sourceTree = "<group>"; }; @@ -122,7 +121,6 @@ 71F3C30911F3CC22007B9F12 /* src */ = { isa = PBXGroup; children = ( - 55858D0A178609A80068B8FC /* cfg.c */, 55858D0B178609A80068B8FC /* connection.c */, 55858D0C178609A80068B8FC /* connection.h */, 55858D0D178609A80068B8FC /* fifo.c */, @@ -359,7 +357,7 @@ ../.., ../../../plugins/dfcdrom, ); - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.7; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; STRIP_INSTALLED_PRODUCT = NO; @@ -391,7 +389,7 @@ ../.., ../../../plugins/dfcdrom, ); - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.7; SDKROOT = macosx; VALID_ARCHS = "i386 x86_64"; }; diff --git a/macosx/plugins/Bladesio1/English.lproj/Bladesio1PluginConfig.xib b/macosx/plugins/Bladesio1/English.lproj/Bladesio1PluginConfig.xib index b77e5264..26b3fd66 100644 --- a/macosx/plugins/Bladesio1/English.lproj/Bladesio1PluginConfig.xib +++ b/macosx/plugins/Bladesio1/English.lproj/Bladesio1PluginConfig.xib @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00"> <data> - <int key="IBDocument.SystemTarget">1060</int> + <int key="IBDocument.SystemTarget">1070</int> <string key="IBDocument.SystemVersion">12E55</string> <string key="IBDocument.InterfaceBuilderVersion">3084</string> <string key="IBDocument.AppKitVersion">1187.39</string> @@ -11,6 +11,7 @@ <string key="NS.object.0">3084</string> </object> <array key="IBDocument.IntegratedClassDependencies"> + <string>IBNSLayoutConstraint</string> <string>NSBox</string> <string>NSButton</string> <string>NSButtonCell</string> @@ -45,7 +46,7 @@ <object class="NSWindowTemplate" id="151678379"> <int key="NSWindowStyleMask">1</int> <int key="NSWindowBacking">2</int> - <string key="NSWindowRect">{{131, 362}, {255, 197}}</string> + <string key="NSWindowRect">{{131, 362}, {315, 203}}</string> <int key="NSWTFlags">1886912512</int> <string key="NSWindowTitle">BladeSIO1 Configuration</string> <string key="NSWindowClass">NSWindow</string> @@ -53,7 +54,7 @@ <characters key="NS.bytes">View</characters> </object> <nil key="NSUserInterfaceItemIdentifier"/> - <string key="NSWindowContentMinSize">{283.34100000000001, 107}</string> + <string key="NSWindowContentMinSize">{315, 203}</string> <object class="NSView" key="NSWindowView" id="127793487"> <reference key="NSNextResponder"/> <int key="NSvFlags">256</int> @@ -61,8 +62,9 @@ <object class="NSButton" id="348063277"> <reference key="NSNextResponder" ref="127793487"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{14, 13}, {82, 32}}</string> + <string key="NSFrame">{{154, 13}, {82, 32}}</string> <reference key="NSSuperview" ref="127793487"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="45529240"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="921967453"> @@ -88,8 +90,10 @@ <object class="NSButton" id="45529240"> <reference key="NSNextResponder" ref="127793487"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{176, 13}, {65, 32}}</string> + <string key="NSFrame">{{236, 13}, {65, 32}}</string> <reference key="NSSuperview" ref="127793487"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="764681236"> <int key="NSCellFlags">67108864</int> @@ -118,8 +122,9 @@ <object class="NSTextField" id="83047673"> <reference key="NSNextResponder" ref="382228618"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{15, 73}, {85, 17}}</string> + <string key="NSFrame">{{15, 79}, {85, 17}}</string> <reference key="NSSuperview" ref="382228618"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="817504184"/> <string key="NSReuseIdentifierKey">_NS:1535</string> <bool key="NSEnabled">YES</bool> @@ -154,8 +159,9 @@ <object class="NSTextField" id="704624630"> <reference key="NSNextResponder" ref="382228618"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{15, 42}, {85, 17}}</string> + <string key="NSFrame">{{15, 48}, {85, 17}}</string> <reference key="NSSuperview" ref="382228618"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="723933460"/> <string key="NSReuseIdentifierKey">_NS:1535</string> <bool key="NSEnabled">YES</bool> @@ -174,8 +180,9 @@ <object class="NSTextField" id="764848078"> <reference key="NSNextResponder" ref="382228618"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{15, 14}, {85, 17}}</string> + <string key="NSFrame">{{15, 20}, {85, 17}}</string> <reference key="NSSuperview" ref="382228618"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="471354310"/> <string key="NSReuseIdentifierKey">_NS:1535</string> <bool key="NSEnabled">YES</bool> @@ -194,8 +201,9 @@ <object class="NSTextField" id="817504184"> <reference key="NSNextResponder" ref="382228618"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{105, 71}, {96, 22}}</string> + <string key="NSFrame">{{105, 77}, {156, 22}}</string> <reference key="NSSuperview" ref="382228618"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="704624630"/> <string key="NSReuseIdentifierKey">_NS:9</string> <bool key="NSEnabled">YES</bool> @@ -228,9 +236,10 @@ <object class="NSTextField" id="471354310"> <reference key="NSNextResponder" ref="382228618"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{105, 12}, {96, 22}}</string> + <string key="NSFrame">{{105, 18}, {156, 22}}</string> <reference key="NSSuperview" ref="382228618"/> - <reference key="NSNextKeyView" ref="348063277"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="497434569"/> <string key="NSReuseIdentifierKey">_NS:9</string> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="843862144"> @@ -288,8 +297,9 @@ <object class="NSPopUpButton" id="723933460"> <reference key="NSNextResponder" ref="382228618"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{103, 39}, {101, 26}}</string> + <string key="NSFrame">{{103, 45}, {161, 26}}</string> <reference key="NSSuperview" ref="382228618"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="764848078"/> <string key="NSReuseIdentifierKey">_NS:9</string> <bool key="NSEnabled">YES</bool> @@ -311,6 +321,7 @@ <string key="NSKeyEquiv"/> <int key="NSKeyEquivModMask">1048576</int> <int key="NSMnemonicLoc">2147483647</int> + <int key="NSState">1</int> <object class="NSCustomResource" key="NSOnImage" id="939390407"> <string key="NSClassName">NSImage</string> <string key="NSResourceName">NSMenuCheckmark</string> @@ -360,14 +371,16 @@ <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> </array> - <string key="NSFrame">{{1, 1}, {219, 102}}</string> + <string key="NSFrame">{{1, 1}, {279, 108}}</string> <reference key="NSSuperview" ref="82652069"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="83047673"/> <string key="NSReuseIdentifierKey">_NS:11</string> </object> </array> - <string key="NSFrame">{{17, 57}, {221, 104}}</string> + <string key="NSFrame">{{17, 57}, {281, 110}}</string> <reference key="NSSuperview" ref="127793487"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="382228618"/> <string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSOffsets">{0, 0}</string> @@ -395,8 +408,9 @@ <object class="NSButton" id="537116407"> <reference key="NSNextResponder" ref="127793487"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{16, 164}, {61, 18}}</string> + <string key="NSFrame">{{16, 170}, {61, 18}}</string> <reference key="NSSuperview" ref="127793487"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="82652069"/> <string key="NSReuseIdentifierKey">_NS:9</string> <bool key="NSEnabled">YES</bool> @@ -427,13 +441,39 @@ </object> <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> + <object class="NSButton" id="497434569"> + <reference key="NSNextResponder" ref="127793487"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{14, 13}, {75, 32}}</string> + <reference key="NSSuperview" ref="127793487"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="348063277"/> + <string key="NSReuseIdentifierKey">_NS:9</string> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="982900033"> + <int key="NSCellFlags">67108864</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents">Reset</string> + <reference key="NSSupport" ref="918131184"/> + <string key="NSCellIdentifier">_NS:9</string> + <reference key="NSControlView" ref="497434569"/> + <int key="NSButtonFlags">-2038284288</int> + <int key="NSButtonFlags2">129</int> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + </object> </array> - <string key="NSFrameSize">{255, 197}</string> + <string key="NSFrameSize">{315, 203}</string> <reference key="NSSuperview"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="537116407"/> </object> - <string key="NSScreenRect">{{0, 0}, {1920, 1080}}</string> - <string key="NSMinSize">{283.34100000000001, 129}</string> + <string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string> + <string key="NSMinSize">{315, 225}</string> <string key="NSMaxSize">{10000000000000, 10000000000000}</string> <bool key="NSWindowIsRestorable">YES</bool> </object> @@ -513,6 +553,14 @@ <int key="connectionID">219</int> </object> <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">resetPreferences:</string> + <reference key="source" ref="509300364"/> + <reference key="destination" ref="497434569"/> + </object> + <int key="connectionID">223</int> + </object> + <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">delegate</string> <reference key="source" ref="151678379"/> @@ -562,10 +610,203 @@ <int key="objectID">6</int> <reference key="object" ref="127793487"/> <array class="NSMutableArray" key="children"> - <reference ref="82652069"/> <reference ref="537116407"/> - <reference ref="348063277"/> + <reference ref="497434569"/> <reference ref="45529240"/> + <reference ref="348063277"/> + <object class="IBNSLayoutConstraint" id="1036876179"> + <reference key="firstItem" ref="127793487"/> + <int key="firstAttribute">4</int> + <int key="relation">0</int> + <reference key="secondItem" ref="45529240"/> + <int key="secondAttribute">4</int> + <float key="multiplier">1</float> + <object class="IBNSLayoutSymbolicConstant" key="constant"> + <double key="value">20</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="127793487"/> + <int key="scoringType">8</int> + <float key="scoringTypeFloat">29</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="842829921"> + <reference key="firstItem" ref="127793487"/> + <int key="firstAttribute">6</int> + <int key="relation">0</int> + <reference key="secondItem" ref="45529240"/> + <int key="secondAttribute">6</int> + <float key="multiplier">1</float> + <object class="IBNSLayoutSymbolicConstant" key="constant"> + <double key="value">20</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="127793487"/> + <int key="scoringType">8</int> + <float key="scoringTypeFloat">29</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="674129625"> + <reference key="firstItem" ref="45529240"/> + <int key="firstAttribute">5</int> + <int key="relation">0</int> + <reference key="secondItem" ref="348063277"/> + <int key="secondAttribute">6</int> + <float key="multiplier">1</float> + <object class="IBNSLayoutSymbolicConstant" key="constant"> + <double key="value">12</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="127793487"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="870181243"> + <reference key="firstItem" ref="127793487"/> + <int key="firstAttribute">4</int> + <int key="relation">0</int> + <reference key="secondItem" ref="348063277"/> + <int key="secondAttribute">4</int> + <float key="multiplier">1</float> + <object class="IBNSLayoutSymbolicConstant" key="constant"> + <double key="value">20</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="127793487"/> + <int key="scoringType">8</int> + <float key="scoringTypeFloat">29</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="499697857"> + <reference key="firstItem" ref="497434569"/> + <int key="firstAttribute">5</int> + <int key="relation">0</int> + <reference key="secondItem" ref="127793487"/> + <int key="secondAttribute">5</int> + <float key="multiplier">1</float> + <object class="IBNSLayoutSymbolicConstant" key="constant"> + <double key="value">20</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="127793487"/> + <int key="scoringType">8</int> + <float key="scoringTypeFloat">29</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="447479180"> + <reference key="firstItem" ref="127793487"/> + <int key="firstAttribute">4</int> + <int key="relation">0</int> + <reference key="secondItem" ref="497434569"/> + <int key="secondAttribute">4</int> + <float key="multiplier">1</float> + <object class="IBNSLayoutSymbolicConstant" key="constant"> + <double key="value">20</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="127793487"/> + <int key="scoringType">8</int> + <float key="scoringTypeFloat">29</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="290637930"> + <reference key="firstItem" ref="497434569"/> + <int key="firstAttribute">3</int> + <int key="relation">0</int> + <reference key="secondItem" ref="82652069"/> + <int key="secondAttribute">4</int> + <float key="multiplier">1</float> + <object class="IBNSLayoutSymbolicConstant" key="constant"> + <double key="value">20</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="127793487"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="427946131"> + <reference key="firstItem" ref="82652069"/> + <int key="firstAttribute">5</int> + <int key="relation">0</int> + <reference key="secondItem" ref="127793487"/> + <int key="secondAttribute">5</int> + <float key="multiplier">1</float> + <object class="IBNSLayoutSymbolicConstant" key="constant"> + <double key="value">20</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="127793487"/> + <int key="scoringType">8</int> + <float key="scoringTypeFloat">29</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="906287637"> + <reference key="firstItem" ref="127793487"/> + <int key="firstAttribute">6</int> + <int key="relation">0</int> + <reference key="secondItem" ref="82652069"/> + <int key="secondAttribute">6</int> + <float key="multiplier">1</float> + <object class="IBNSLayoutSymbolicConstant" key="constant"> + <double key="value">20</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="127793487"/> + <int key="scoringType">8</int> + <float key="scoringTypeFloat">29</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="391278904"> + <reference key="firstItem" ref="82652069"/> + <int key="firstAttribute">3</int> + <int key="relation">0</int> + <reference key="secondItem" ref="537116407"/> + <int key="secondAttribute">4</int> + <float key="multiplier">1</float> + <object class="IBNSLayoutSymbolicConstant" key="constant"> + <double key="value">8</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="127793487"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="900601962"> + <reference key="firstItem" ref="537116407"/> + <int key="firstAttribute">3</int> + <int key="relation">0</int> + <reference key="secondItem" ref="127793487"/> + <int key="secondAttribute">3</int> + <float key="multiplier">1</float> + <object class="IBNSLayoutSymbolicConstant" key="constant"> + <double key="value">20</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="127793487"/> + <int key="scoringType">8</int> + <float key="scoringTypeFloat">29</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="919721277"> + <reference key="firstItem" ref="537116407"/> + <int key="firstAttribute">5</int> + <int key="relation">0</int> + <reference key="secondItem" ref="127793487"/> + <int key="secondAttribute">5</int> + <float key="multiplier">1</float> + <object class="IBNSLayoutSymbolicConstant" key="constant"> + <double key="value">20</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="127793487"/> + <int key="scoringType">8</int> + <float key="scoringTypeFloat">29</float> + <int key="contentType">3</int> + </object> + <reference ref="82652069"/> </array> <reference key="parent" ref="151678379"/> </object> @@ -582,6 +823,22 @@ <reference key="object" ref="45529240"/> <array class="NSMutableArray" key="children"> <reference ref="764681236"/> + <object class="IBNSLayoutConstraint" id="245057345"> + <reference key="firstItem" ref="45529240"/> + <int key="firstAttribute">7</int> + <int key="relation">0</int> + <nil key="secondItem"/> + <int key="secondAttribute">0</int> + <float key="multiplier">1</float> + <object class="IBLayoutConstant" key="constant"> + <double key="value">53</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="45529240"/> + <int key="scoringType">3</int> + <float key="scoringTypeFloat">9</float> + <int key="contentType">1</int> + </object> </array> <reference key="parent" ref="127793487"/> </object> @@ -609,6 +866,278 @@ <reference ref="817504184"/> <reference ref="704624630"/> <reference ref="723933460"/> + <object class="IBNSLayoutConstraint" id="40692612"> + <reference key="firstItem" ref="471354310"/> + <int key="firstAttribute">3</int> + <int key="relation">0</int> + <reference key="secondItem" ref="82652069"/> + <int key="secondAttribute">3</int> + <float key="multiplier">1</float> + <object class="IBLayoutConstant" key="constant"> + <double key="value">67</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="82652069"/> + <int key="scoringType">3</int> + <float key="scoringTypeFloat">9</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="846592300"> + <reference key="firstItem" ref="471354310"/> + <int key="firstAttribute">5</int> + <int key="relation">0</int> + <reference key="secondItem" ref="764848078"/> + <int key="secondAttribute">6</int> + <float key="multiplier">1</float> + <object class="IBNSLayoutSymbolicConstant" key="constant"> + <double key="value">8</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="82652069"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="60527276"> + <reference key="firstItem" ref="82652069"/> + <int key="firstAttribute">6</int> + <int key="relation">0</int> + <reference key="secondItem" ref="471354310"/> + <int key="secondAttribute">6</int> + <float key="multiplier">1</float> + <object class="IBLayoutConstant" key="constant"> + <double key="value">16</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="82652069"/> + <int key="scoringType">8</int> + <float key="scoringTypeFloat">29</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="513515301"> + <reference key="firstItem" ref="723933460"/> + <int key="firstAttribute">5</int> + <int key="relation">0</int> + <reference key="secondItem" ref="704624630"/> + <int key="secondAttribute">6</int> + <float key="multiplier">1</float> + <object class="IBNSLayoutSymbolicConstant" key="constant"> + <double key="value">8</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="82652069"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="887624534"> + <reference key="firstItem" ref="723933460"/> + <int key="firstAttribute">5</int> + <int key="relation">0</int> + <reference key="secondItem" ref="817504184"/> + <int key="secondAttribute">5</int> + <float key="multiplier">1</float> + <object class="IBLayoutConstant" key="constant"> + <double key="value">0.0</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="82652069"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">2</int> + </object> + <object class="IBNSLayoutConstraint" id="89759382"> + <reference key="firstItem" ref="82652069"/> + <int key="firstAttribute">6</int> + <int key="relation">0</int> + <reference key="secondItem" ref="723933460"/> + <int key="secondAttribute">6</int> + <float key="multiplier">1</float> + <object class="IBLayoutConstant" key="constant"> + <double key="value">16</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="82652069"/> + <int key="scoringType">8</int> + <float key="scoringTypeFloat">29</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="145126621"> + <reference key="firstItem" ref="723933460"/> + <int key="firstAttribute">3</int> + <int key="relation">0</int> + <reference key="secondItem" ref="817504184"/> + <int key="secondAttribute">4</int> + <float key="multiplier">1</float> + <object class="IBLayoutConstant" key="constant"> + <double key="value">8</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="82652069"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="318007249"> + <reference key="firstItem" ref="723933460"/> + <int key="firstAttribute">5</int> + <int key="relation">0</int> + <reference key="secondItem" ref="471354310"/> + <int key="secondAttribute">5</int> + <float key="multiplier">1</float> + <object class="IBLayoutConstant" key="constant"> + <double key="value">0.0</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="82652069"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">2</int> + </object> + <object class="IBNSLayoutConstraint" id="885502674"> + <reference key="firstItem" ref="723933460"/> + <int key="firstAttribute">4</int> + <int key="relation">0</int> + <reference key="secondItem" ref="704624630"/> + <int key="secondAttribute">4</int> + <float key="multiplier">1</float> + <object class="IBLayoutConstant" key="constant"> + <double key="value">0.0</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="82652069"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">2</int> + </object> + <object class="IBNSLayoutConstraint" id="132721671"> + <reference key="firstItem" ref="82652069"/> + <int key="firstAttribute">6</int> + <int key="relation">0</int> + <reference key="secondItem" ref="817504184"/> + <int key="secondAttribute">6</int> + <float key="multiplier">1</float> + <object class="IBLayoutConstant" key="constant"> + <double key="value">16</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="82652069"/> + <int key="scoringType">8</int> + <float key="scoringTypeFloat">29</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="335368693"> + <reference key="firstItem" ref="817504184"/> + <int key="firstAttribute">5</int> + <int key="relation">0</int> + <reference key="secondItem" ref="83047673"/> + <int key="secondAttribute">6</int> + <float key="multiplier">1</float> + <object class="IBNSLayoutSymbolicConstant" key="constant"> + <double key="value">8</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="82652069"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="666704347"> + <reference key="firstItem" ref="817504184"/> + <int key="firstAttribute">3</int> + <int key="relation">0</int> + <reference key="secondItem" ref="82652069"/> + <int key="secondAttribute">3</int> + <float key="multiplier">1</float> + <object class="IBLayoutConstant" key="constant"> + <double key="value">8</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="82652069"/> + <int key="scoringType">3</int> + <float key="scoringTypeFloat">9</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="227679458"> + <reference key="firstItem" ref="764848078"/> + <int key="firstAttribute">11</int> + <int key="relation">0</int> + <reference key="secondItem" ref="471354310"/> + <int key="secondAttribute">11</int> + <float key="multiplier">1</float> + <object class="IBLayoutConstant" key="constant"> + <double key="value">0.0</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="82652069"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">2</int> + </object> + <object class="IBNSLayoutConstraint" id="380664884"> + <reference key="firstItem" ref="764848078"/> + <int key="firstAttribute">5</int> + <int key="relation">0</int> + <reference key="secondItem" ref="82652069"/> + <int key="secondAttribute">5</int> + <float key="multiplier">1</float> + <object class="IBLayoutConstant" key="constant"> + <double key="value">16</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="82652069"/> + <int key="scoringType">8</int> + <float key="scoringTypeFloat">29</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="290329374"> + <reference key="firstItem" ref="704624630"/> + <int key="firstAttribute">5</int> + <int key="relation">0</int> + <reference key="secondItem" ref="82652069"/> + <int key="secondAttribute">5</int> + <float key="multiplier">1</float> + <object class="IBLayoutConstant" key="constant"> + <double key="value">16</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="82652069"/> + <int key="scoringType">8</int> + <float key="scoringTypeFloat">29</float> + <int key="contentType">3</int> + </object> + <object class="IBNSLayoutConstraint" id="506743589"> + <reference key="firstItem" ref="83047673"/> + <int key="firstAttribute">11</int> + <int key="relation">0</int> + <reference key="secondItem" ref="817504184"/> + <int key="secondAttribute">11</int> + <float key="multiplier">1</float> + <object class="IBLayoutConstant" key="constant"> + <double key="value">0.0</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="82652069"/> + <int key="scoringType">6</int> + <float key="scoringTypeFloat">24</float> + <int key="contentType">2</int> + </object> + <object class="IBNSLayoutConstraint" id="462314221"> + <reference key="firstItem" ref="83047673"/> + <int key="firstAttribute">5</int> + <int key="relation">0</int> + <reference key="secondItem" ref="82652069"/> + <int key="secondAttribute">5</int> + <float key="multiplier">1</float> + <object class="IBLayoutConstant" key="constant"> + <double key="value">16</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="82652069"/> + <int key="scoringType">8</int> + <float key="scoringTypeFloat">29</float> + <int key="contentType">3</int> + </object> <reference ref="764848078"/> <reference ref="471354310"/> </array> @@ -619,6 +1148,22 @@ <reference key="object" ref="537116407"/> <array class="NSMutableArray" key="children"> <reference ref="683031745"/> + <object class="IBNSLayoutConstraint" id="406789566"> + <reference key="firstItem" ref="537116407"/> + <int key="firstAttribute">7</int> + <int key="relation">0</int> + <nil key="secondItem"/> + <int key="secondAttribute">0</int> + <float key="multiplier">1</float> + <object class="IBLayoutConstant" key="constant"> + <double key="value">55</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="537116407"/> + <int key="scoringType">3</int> + <float key="scoringTypeFloat">9</float> + <int key="contentType">1</int> + </object> </array> <reference key="parent" ref="127793487"/> </object> @@ -632,6 +1177,22 @@ <reference key="object" ref="83047673"/> <array class="NSMutableArray" key="children"> <reference ref="546071709"/> + <object class="IBNSLayoutConstraint" id="997131426"> + <reference key="firstItem" ref="83047673"/> + <int key="firstAttribute">7</int> + <int key="relation">0</int> + <nil key="secondItem"/> + <int key="secondAttribute">0</int> + <float key="multiplier">1</float> + <object class="IBLayoutConstant" key="constant"> + <double key="value">79</double> + </object> + <float key="priority">1000</float> + <reference key="containingView" ref="83047673"/> + <int key="scoringType">3</int> + <float key="scoringTypeFloat">9</float> + <int key="contentType">1</int> + </object> </array> <reference key="parent" ref="82652069"/> </object> @@ -741,6 +1302,179 @@ <reference key="object" ref="1041323832"/> <reference key="parent" ref="843862144"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">221</int> + <reference key="object" ref="497434569"/> + <array class="NSMutableArray" key="children"> + <reference ref="982900033"/> + </array> + <reference key="parent" ref="127793487"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">222</int> + <reference key="object" ref="982900033"/> + <reference key="parent" ref="497434569"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">224</int> + <reference key="object" ref="406789566"/> + <reference key="parent" ref="537116407"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">225</int> + <reference key="object" ref="462314221"/> + <reference key="parent" ref="82652069"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">226</int> + <reference key="object" ref="290329374"/> + <reference key="parent" ref="82652069"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">227</int> + <reference key="object" ref="885502674"/> + <reference key="parent" ref="82652069"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">228</int> + <reference key="object" ref="318007249"/> + <reference key="parent" ref="82652069"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">229</int> + <reference key="object" ref="666704347"/> + <reference key="parent" ref="82652069"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">230</int> + <reference key="object" ref="335368693"/> + <reference key="parent" ref="82652069"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">232</int> + <reference key="object" ref="380664884"/> + <reference key="parent" ref="82652069"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">233</int> + <reference key="object" ref="60527276"/> + <reference key="parent" ref="82652069"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">234</int> + <reference key="object" ref="145126621"/> + <reference key="parent" ref="82652069"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">235</int> + <reference key="object" ref="132721671"/> + <reference key="parent" ref="82652069"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">236</int> + <reference key="object" ref="89759382"/> + <reference key="parent" ref="82652069"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">237</int> + <reference key="object" ref="227679458"/> + <reference key="parent" ref="82652069"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">238</int> + <reference key="object" ref="887624534"/> + <reference key="parent" ref="82652069"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">239</int> + <reference key="object" ref="846592300"/> + <reference key="parent" ref="82652069"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">240</int> + <reference key="object" ref="513515301"/> + <reference key="parent" ref="82652069"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">241</int> + <reference key="object" ref="506743589"/> + <reference key="parent" ref="82652069"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">242</int> + <reference key="object" ref="919721277"/> + <reference key="parent" ref="127793487"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">243</int> + <reference key="object" ref="391278904"/> + <reference key="parent" ref="127793487"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">244</int> + <reference key="object" ref="870181243"/> + <reference key="parent" ref="127793487"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">245</int> + <reference key="object" ref="674129625"/> + <reference key="parent" ref="127793487"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">247</int> + <reference key="object" ref="290637930"/> + <reference key="parent" ref="127793487"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">250</int> + <reference key="object" ref="900601962"/> + <reference key="parent" ref="127793487"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">251</int> + <reference key="object" ref="427946131"/> + <reference key="parent" ref="127793487"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">252</int> + <reference key="object" ref="499697857"/> + <reference key="parent" ref="127793487"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">253</int> + <reference key="object" ref="1036876179"/> + <reference key="parent" ref="127793487"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">254</int> + <reference key="object" ref="245057345"/> + <reference key="parent" ref="45529240"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">255</int> + <reference key="object" ref="997131426"/> + <reference key="parent" ref="83047673"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">256</int> + <reference key="object" ref="40692612"/> + <reference key="parent" ref="82652069"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">246</int> + <reference key="object" ref="842829921"/> + <reference key="parent" ref="127793487"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">249</int> + <reference key="object" ref="906287637"/> + <reference key="parent" ref="127793487"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">248</int> + <reference key="object" ref="447479180"/> + <reference key="parent" ref="127793487"/> + </object> </array> </object> <dictionary class="NSMutableDictionary" key="flattenedProperties"> @@ -749,19 +1483,52 @@ <string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="186.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="187.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <array class="NSMutableArray" key="193.IBNSViewMetadataConstraints"> + <reference ref="462314221"/> + <reference ref="506743589"/> + <reference ref="290329374"/> + <reference ref="380664884"/> + <reference ref="227679458"/> + <reference ref="666704347"/> + <reference ref="335368693"/> + <reference ref="132721671"/> + <reference ref="885502674"/> + <reference ref="318007249"/> + <reference ref="145126621"/> + <reference ref="89759382"/> + <reference ref="887624534"/> + <reference ref="513515301"/> + <reference ref="60527276"/> + <reference ref="846592300"/> + <reference ref="40692612"/> + </array> + <boolean value="NO" key="193.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> <string key="193.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <array key="194.IBNSViewMetadataConstraints"> + <reference ref="406789566"/> + </array> + <boolean value="NO" key="194.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> <string key="194.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="195.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <array key="198.IBNSViewMetadataConstraints"> + <reference ref="997131426"/> + </array> + <boolean value="NO" key="198.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> <string key="198.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="199.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <boolean value="NO" key="200.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> <string key="200.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="201.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <boolean value="NO" key="202.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> <string key="202.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="203.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <boolean value="NO" key="204.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> <string key="204.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="205.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <boolean value="NO" key="206.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> <string key="206.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="207.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <boolean value="NO" key="208.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> <string key="208.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="209.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="210.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -771,23 +1538,149 @@ <integer value="1041" key="220.IBNumberFormatterBehaviorMetadataKey"/> <boolean value="YES" key="220.IBNumberFormatterLocalizesFormatMetadataKey"/> <string key="220.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <boolean value="NO" key="221.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> + <string key="221.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="222.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="224.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="225.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="226.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="227.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="228.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="229.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="230.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="232.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="233.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="234.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="235.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="236.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="237.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="238.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="239.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="240.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="241.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="242.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="243.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="244.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="245.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="246.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="247.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="248.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="249.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="250.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="251.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="252.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="253.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="254.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="255.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="256.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <array key="6.IBNSViewMetadataConstraints"> + <reference ref="919721277"/> + <reference ref="900601962"/> + <reference ref="391278904"/> + <reference ref="906287637"/> + <reference ref="427946131"/> + <reference ref="290637930"/> + <reference ref="447479180"/> + <reference ref="499697857"/> + <reference ref="870181243"/> + <reference ref="674129625"/> + <reference ref="842829921"/> + <reference ref="1036876179"/> + </array> <string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <boolean value="NO" key="7.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> <string key="7.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <array key="8.IBNSViewMetadataConstraints"> + <reference ref="245057345"/> + </array> + <boolean value="NO" key="8.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> <string key="8.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> </dictionary> <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/> <nil key="activeLocalization"/> <dictionary class="NSMutableDictionary" key="localizations"/> <nil key="sourceID"/> - <int key="maxID">220</int> + <int key="maxID">259</int> + </object> + <object class="IBClassDescriber" key="IBDocument.Classes"> + <array class="NSMutableArray" key="referencedPartialClassDescriptions"> + <object class="IBPartialClassDescription"> + <string key="className">Bladesio1PluginConfigController</string> + <string key="superclassName">NSWindowController</string> + <dictionary class="NSMutableDictionary" key="actions"> + <string key="cancel:">id</string> + <string key="ok:">id</string> + <string key="resetPreferences:">id</string> + <string key="toggleEnabled:">id</string> + </dictionary> + <dictionary class="NSMutableDictionary" key="actionInfosByName"> + <object class="IBActionInfo" key="cancel:"> + <string key="name">cancel:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo" key="ok:"> + <string key="name">ok:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo" key="resetPreferences:"> + <string key="name">resetPreferences:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo" key="toggleEnabled:"> + <string key="name">toggleEnabled:</string> + <string key="candidateClassName">id</string> + </object> + </dictionary> + <dictionary class="NSMutableDictionary" key="outlets"> + <string key="configBox">NSBox</string> + <string key="enabledButton">NSButton</string> + <string key="ipAddressField">NSTextField</string> + <string key="playerMenu">NSPopUpButton</string> + <string key="portField">NSTextField</string> + </dictionary> + <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName"> + <object class="IBToOneOutletInfo" key="configBox"> + <string key="name">configBox</string> + <string key="candidateClassName">NSBox</string> + </object> + <object class="IBToOneOutletInfo" key="enabledButton"> + <string key="name">enabledButton</string> + <string key="candidateClassName">NSButton</string> + </object> + <object class="IBToOneOutletInfo" key="ipAddressField"> + <string key="name">ipAddressField</string> + <string key="candidateClassName">NSTextField</string> + </object> + <object class="IBToOneOutletInfo" key="playerMenu"> + <string key="name">playerMenu</string> + <string key="candidateClassName">NSPopUpButton</string> + </object> + <object class="IBToOneOutletInfo" key="portField"> + <string key="name">portField</string> + <string key="candidateClassName">NSTextField</string> + </object> + </dictionary> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">./Classes/Bladesio1PluginConfigController.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSLayoutConstraint</string> + <string key="superclassName">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">./Classes/NSLayoutConstraint.h</string> + </object> + </object> + </array> </object> - <object class="IBClassDescriber" key="IBDocument.Classes"/> <int key="IBDocument.localizationMode">0</int> <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string> <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> - <real value="1060" key="NS.object.0"/> + <real value="1070" key="NS.object.0"/> </object> <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> <int key="IBDocument.defaultPropertyAccessControl">3</int> @@ -796,5 +1689,6 @@ <string key="NSMenuMixedState">{10, 3}</string> <string key="NSSwitch">{15, 15}</string> </dictionary> + <bool key="IBDocument.UseAutolayout">YES</bool> </data> </archive> diff --git a/macosx/plugins/Bladesio1/English.lproj/Credits.rtf b/macosx/plugins/Bladesio1/English.lproj/Credits.rtf index 76fa6442..948de054 100644 --- a/macosx/plugins/Bladesio1/English.lproj/Credits.rtf +++ b/macosx/plugins/Bladesio1/English.lproj/Credits.rtf @@ -1,13 +1,14 @@ -{\rtf1\mac\ansicpg10025\cocoartf824\cocoasubrtf420 -{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;} +{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf390 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\viewkind0 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 \f0\b\fs24 \cf0 Original coder: -\f1\b0 \ +\b0 \ linuzappz\ \ -\f0\b Macintosh Port: -\f1\b0 \ - Wei Mingzhi}
\ No newline at end of file +\b Macintosh Port: +\b0 \ + Charles "Madd the Sane" Betts}
\ No newline at end of file diff --git a/macosx/plugins/Bladesio1/English.lproj/Localizable.strings b/macosx/plugins/Bladesio1/English.lproj/Localizable.strings index 2faf6e07..2c2be831 100644 --- a/macosx/plugins/Bladesio1/English.lproj/Localizable.strings +++ b/macosx/plugins/Bladesio1/English.lproj/Localizable.strings @@ -6,4 +6,4 @@ Copyright 2011 __MyCompanyName__. All rights reserved. */ -"CD-ROM Drive Reader" = "CD-ROM Drive Reader"; +"sio1Blade" = "Blade sio1"; diff --git a/macosx/plugins/Bladesio1/macsrc/PluginConfigController.m b/macosx/plugins/Bladesio1/macsrc/PluginConfigController.m index 13d9ef6e..00af2192 100755 --- a/macosx/plugins/Bladesio1/macsrc/PluginConfigController.m +++ b/macosx/plugins/Bladesio1/macsrc/PluginConfigController.m @@ -23,6 +23,7 @@ #include "typedefs.h" #include "sio1.h" #import "ARCBridge.h" +#include "macsrc.h" #define APP_ID @"net.pcsxr.Bladesio1" #define PrefsKey APP_ID @" Settings" @@ -89,7 +90,7 @@ void ReadConfig() [defaults registerDefaults:[NSDictionary dictionaryWithObjectsAndKeys: [NSDictionary dictionaryWithObjectsAndKeys: @NO, kSioEnabled, - @((unsigned short)33307), kSioPort, + @((u16)33307), kSioPort, @"127.0.0.1", kSioIPAddress, @(PLAYER_DISABLED), kSioPlayer, nil], PrefsKey, nil]]; @@ -115,25 +116,25 @@ void ReadConfig() NSMutableDictionary *writeDic = [NSMutableDictionary dictionaryWithDictionary:keyValues]; - NSString *theAddress = [ipAddressField stringValue]; - { - unsigned char a, b, c, d; - if (sscanf([theAddress cStringUsingEncoding:NSASCIIStringEncoding], "%s.%s.%s.%s", &a, &b, &c, &d) != 4) { - NSBeginAlertSheet(@"Invalid IP address", nil, nil, nil, [self window], nil, NULL, NULL, NULL, @"The IP address cannot be a hostname,"); - } + if ([theAddress lengthOfBytesUsingEncoding:NSASCIIStringEncoding] > (sizeof(settings.ip) - 1)) { + NSBeginAlertSheet(@"Address too long", nil, nil, nil, [self window], nil, NULL, NULL, NULL, @"The address is too long. Try to use only the IP address and not a host name."); + return; } [writeDic setObject:(([enabledButton state] == NSOnState) ? @YES : @NO) forKey:kSioEnabled]; - [writeDic setObject:[ipAddressField stringValue] forKey:kSioIPAddress]; + [writeDic setObject:theAddress forKey:kSioIPAddress]; [writeDic setObject:@((unsigned short)[portField intValue]) forKey:kSioPort]; - - switch ([playerMenu indexOfSelectedItem]) { - default: - case 0: [writeDic setObject:@(PLAYER_DISABLED) forKey:kSioPlayer]; break; - case 1: [writeDic setObject:@(PLAYER_MASTER) forKey:kSioPlayer]; break; - case 2: [writeDic setObject:@(PLAYER_SLAVE) forKey:kSioPlayer]; break; + { + int player; + switch ([playerMenu indexOfSelectedItem]) { + default: + case 0: player = PLAYER_DISABLED; break; + case 1: player = PLAYER_MASTER; break; + case 2: player = PLAYER_SLAVE; break; + } + [writeDic setObject:@(player) forKey:kSioPlayer]; } // write to defaults @@ -150,11 +151,13 @@ void ReadConfig() { BOOL isEnabled = [enabledButton state] == NSOnState ? YES : NO; - for (NSView *subView in [configBox subviews]) { + for (NSView *subView in [[configBox subviews][0] subviews]) { if ([subView isKindOfClass:[NSTextField class]] && ![(NSTextField*)subView isEditable]) { [(NSTextField*)subView setTextColor:isEnabled ? [NSColor controlTextColor] : [NSColor disabledControlTextColor]]; } else { - [(NSControl*)subView setEnabled:isEnabled]; + if ([subView respondsToSelector:@selector(setEnabled:)]) { + [(NSControl*)subView setEnabled:isEnabled]; + } } } } @@ -177,14 +180,16 @@ void ReadConfig() [enabledButton setState: [[keyValues objectForKey:kSioEnabled] boolValue] ? NSOnState : NSOffState]; [ipAddressField setTitleWithMnemonic:[keyValues objectForKey:kSioIPAddress]]; - [portField setValue:[keyValues objectForKey:kSioPort]]; + [portField setIntValue:[[keyValues objectForKey:kSioPort] intValue]]; - switch ([[keyValues objectForKey:kSioPlayer] intValue]) { + switch ([[keyValues objectForKey:kSioPlayer] integerValue]) { default: case PLAYER_DISABLED: [playerMenu selectItemAtIndex:0]; break; case PLAYER_MASTER: [playerMenu selectItemAtIndex:1]; break; case PLAYER_SLAVE: [playerMenu selectItemAtIndex:2]; break; } + + [self toggleEnabled:nil]; } - (void)awakeFromNib |