Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-06-01 13:41:28 +00:00
Code Issues Projects Releases Wiki Activity

Here we are: now everything work for iPad.

Browse Source
This commit is contained in:
jvernet 2016-01-01 11:22:18 +01:00 committed by Aaron Culliney
parent 86064cf1c6
commit 4d89d173f4
19 changed files with 45 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Apple2Mac/Apple2Mac.xcodeproj/project.pbxproj
View File

@ -126,6 +126,14 @@
4E1733E41C2C5F7A00CDF9DF /* AppleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E1733DD1C2C5E5D00CDF9DF /* AppleViewController.m */; };
4ECBEADF1C3432010046F537 /* speedtest.dsk in Resources */ = {isa = PBXBuildFile; fileRef = 4ECBEADD1C3432010046F537 /* speedtest.dsk */; };
4ECBEAE01C3432010046F537 /* testvm1.dsk in Resources */ = {isa = PBXBuildFile; fileRef = 4ECBEADE1C3432010046F537 /* testvm1.dsk */; };
4ECFC39E1C368620008E2633 /* flapple140.po in Resources */ = {isa = PBXBuildFile; fileRef = 4ECFC39B1C368620008E2633 /* flapple140.po */; };
4ECFC39F1C368620008E2633 /* mystery.dsk in Resources */ = {isa = PBXBuildFile; fileRef = 4ECFC39C1C368620008E2633 /* mystery.dsk */; };
4ECFC3A01C368620008E2633 /* NSCT.dsk in Resources */ = {isa = PBXBuildFile; fileRef = 4ECFC39D1C368620008E2633 /* NSCT.dsk */; };
4ECFC3A11C368643008E2633 /* NSCT.dsk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4ECFC39D1C368620008E2633 /* NSCT.dsk */; };
4ECFC3A21C368645008E2633 /* flapple140.po in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4ECFC39B1C368620008E2633 /* flapple140.po */; };
4ECFC3A31C368647008E2633 /* mystery.dsk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4ECFC39C1C368620008E2633 /* mystery.dsk */; };
4ECFC3A41C368649008E2633 /* speedtest.dsk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4ECBEADD1C3432010046F537 /* speedtest.dsk */; };
4ECFC3A51C36864B008E2633 /* testvm1.dsk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4ECBEADE1C3432010046F537 /* testvm1.dsk */; };
4EEF0E8A1C3536A3001BEB67 /* disksViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EEF0E891C3536A3001BEB67 /* disksViewController.m */; };
773B3D101956885A0085CE5F /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 773B3D0F1956885A0085CE5F /* Cocoa.framework */; };
773B3D1A1956885A0085CE5F /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 773B3D181956885A0085CE5F /* InfoPlist.strings */; };
@ -352,19 +360,23 @@
};
4E1733EF1C2E955700CDF9DF /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
buildActionMask = 8;
dstPath = ./disks;
dstSubfolderSpec = 16;
files = (
4ECFC3A11C368643008E2633 /* NSCT.dsk in CopyFiles */,
4ECFC3A21C368645008E2633 /* flapple140.po in CopyFiles */,
4ECFC3A51C36864B008E2633 /* testvm1.dsk in CopyFiles */,
4ECFC3A41C368649008E2633 /* speedtest.dsk in CopyFiles */,
4ECFC3A31C368647008E2633 /* mystery.dsk in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
runOnlyForDeploymentPostprocessing = 1;
};
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
4A2636F819FDEDB700DBFB00 /* Apple2Mac.help */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Apple2Mac.help; sourceTree = "<group>"; };
4A61119B1A6A1DE60035F7DE /* blank.po.gz */ = {isa = PBXFileReference; lastKnownFileType = archive.gzip; path = blank.po.gz; sourceTree = "<group>"; };
4A6111A21A6A1DFC0035F7DE /* flapple140.po.gz */ = {isa = PBXFileReference; lastKnownFileType = archive.gzip; path = flapple140.po.gz; sourceTree = "<group>"; };
4A7EDC911AE092680072E98A /* glhudmodel.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = glhudmodel.c; sourceTree = "<group>"; };
4A7EDC921AE092680072E98A /* glnode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = glnode.c; sourceTree = "<group>"; };
4A7EDC9D1AE092B80072E98A /* interface.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = interface.c; sourceTree = "<group>"; };
@ -377,7 +389,6 @@
4ADC523019E8D3F600186B36 /* blank.dsk.gz */ = {isa = PBXFileReference; lastKnownFileType = archive.gzip; path = blank.dsk.gz; sourceTree = "<group>"; };
4ADC523119E8D3F600186B36 /* blank.nib.gz */ = {isa = PBXFileReference; lastKnownFileType = archive.gzip; path = blank.nib.gz; sourceTree = "<group>"; };
4ADC523219E8D3F600186B36 /* etc.dsk.gz */ = {isa = PBXFileReference; lastKnownFileType = archive.gzip; path = etc.dsk.gz; sourceTree = "<group>"; };
4ADC523319E8D3F600186B36 /* mystery.dsk.gz */ = {isa = PBXFileReference; lastKnownFileType = archive.gzip; path = mystery.dsk.gz; sourceTree = "<group>"; };
4ADC523419E8D3F600186B36 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
4ADC523619E8D3F600186B36 /* speedtest.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = speedtest.txt; sourceTree = "<group>"; };
4ADC523719E8D3F600186B36 /* testdisplay1.dsk.gz */ = {isa = PBXFileReference; lastKnownFileType = archive.gzip; path = testdisplay1.dsk.gz; sourceTree = "<group>"; };
@ -402,6 +413,9 @@
4E4E62A01C2C5B56002E324F /* iosPrefControllerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = iosPrefControllerViewController.m; sourceTree = "<group>"; };
4ECBEADD1C3432010046F537 /* speedtest.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; path = speedtest.dsk; sourceTree = "<group>"; };
4ECBEADE1C3432010046F537 /* testvm1.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; path = testvm1.dsk; sourceTree = "<group>"; };
4ECFC39B1C368620008E2633 /* flapple140.po */ = {isa = PBXFileReference; lastKnownFileType = file; path = flapple140.po; sourceTree = "<group>"; };
4ECFC39C1C368620008E2633 /* mystery.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; path = mystery.dsk; sourceTree = "<group>"; };
4ECFC39D1C368620008E2633 /* NSCT.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; path = NSCT.dsk; sourceTree = "<group>"; };
4EEF0E881C3536A3001BEB67 /* disksViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = disksViewController.h; sourceTree = "<group>"; };
4EEF0E891C3536A3001BEB67 /* disksViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = disksViewController.m; sourceTree = "<group>"; };
773B3D0C1956885A0085CE5F /* Apple2Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Apple2Mac.app; sourceTree = BUILT_PRODUCTS_DIR; };
@ -601,16 +615,17 @@
4ADC522F19E8D3F600186B36 /* Documents */ = {
isa = PBXGroup;
children = (
4ECFC39B1C368620008E2633 /* flapple140.po */,
4ECFC39C1C368620008E2633 /* mystery.dsk */,
4ECFC39D1C368620008E2633 /* NSCT.dsk */,
4AFC170F1AAE9CC000B215FA /* testdisplay1.nib.gz */,
4ECBEADD1C3432010046F537 /* speedtest.dsk */,
4ECBEADE1C3432010046F537 /* testvm1.dsk */,
4AFC17101AAE9CC000B215FA /* testvm1.nib.gz */,
4A6111A21A6A1DFC0035F7DE /* flapple140.po.gz */,
4A61119B1A6A1DE60035F7DE /* blank.po.gz */,
4ADC523019E8D3F600186B36 /* blank.dsk.gz */,
4ADC523119E8D3F600186B36 /* blank.nib.gz */,
4ADC523219E8D3F600186B36 /* etc.dsk.gz */,
4ADC523319E8D3F600186B36 /* mystery.dsk.gz */,
4ADC523419E8D3F600186B36 /* README */,
4ADC523619E8D3F600186B36 /* speedtest.txt */,
4ADC523719E8D3F600186B36 /* testdisplay1.dsk.gz */,
@ -1257,11 +1272,14 @@
935C55431C12BCFD0013166D /* Apple2iOS-Info.plist in Resources */,
935C55461C12BE110013166D /* LaunchScreen.xib in Resources */,
935C55351C12BA5F0013166D /* Main.storyboard in Resources */,
4ECFC3A01C368620008E2633 /* NSCT.dsk in Resources */,
935C55921C1371AD0013166D /* Basic.vsh in Resources */,
4ECBEAE01C3432010046F537 /* testvm1.dsk in Resources */,
935C55911C1371AD0013166D /* Basic.fsh in Resources */,
4ECFC39E1C368620008E2633 /* flapple140.po in Resources */,
4ECBEADF1C3432010046F537 /* speedtest.dsk in Resources */,
93206C781C14E14000668153 /* Apple2iOS.strings in Resources */,
4ECFC39F1C368620008E2633 /* mystery.dsk in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

2
Apple2Mac/Apple2Mac/AppleViewController.m
View File

@ -40,7 +40,7 @@
}
- (IBAction)unwindToMainViewController:(UIStoryboardSegue*)sender
- (IBAction)unwindForSegue:(UIStoryboardSegue*)sender
{
cpu_resume();
}

1
Apple2Mac/Apple2Mac/disksViewController.m
View File

@ -65,6 +65,7 @@
-(IBAction)goodbye:(id)sender
{
[self dismissViewControllerAnimated:YES completion:nil];
cpu_resume();
}
@end

1
Apple2Mac/Apple2Mac/iosPrefControllerViewController.m
View File

@ -218,6 +218,7 @@
-(IBAction)goodbye:(id)sender
{
[self dismissViewControllerAnimated:YES completion:nil];
cpu_resume();
}
- (IBAction)unwindToMainViewController:(UIStoryboardSegue*)sender
{

BIN
Apple2Mac/Apple2iOS/Assets.xcassets/AppIcon.appiconset/2e-130.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
Apple2Mac/Apple2iOS/Assets.xcassets/AppIcon.appiconset/2e-29.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 752 B

BIN
Apple2Mac/Apple2iOS/Assets.xcassets/AppIcon.appiconset/2e-30.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 752 B

BIN
Apple2Mac/Apple2iOS/Assets.xcassets/AppIcon.appiconset/2e-40.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 997 B

BIN
Apple2Mac/Apple2iOS/Assets.xcassets/AppIcon.appiconset/2e-41.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 997 B

BIN
Apple2Mac/Apple2iOS/Assets.xcassets/AppIcon.appiconset/2e-60.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
Apple2Mac/Apple2iOS/Assets.xcassets/AppIcon.appiconset/2e-76.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

21
Apple2Mac/Apple2iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
View File

@ -1,8 +1,9 @@
{
"images" : [
{
"idiom" : "iphone",
"size" : "29x29",
"idiom" : "iphone",
"filename" : "2e-29.png",
"scale" : "2x"
},
{
@ -11,8 +12,9 @@
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"idiom" : "iphone",
"filename" : "2e-40.png",
"scale" : "2x"
},
{
@ -21,8 +23,9 @@
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"idiom" : "iphone",
"filename" : "2e-60.png",
"scale" : "2x"
},
{
@ -31,8 +34,9 @@
"scale" : "3x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"idiom" : "ipad",
"filename" : "2e-30.png",
"scale" : "1x"
},
{
@ -41,8 +45,9 @@
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"idiom" : "ipad",
"filename" : "2e-41.png",
"scale" : "1x"
},
{
@ -51,8 +56,9 @@
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"idiom" : "ipad",
"filename" : "2e-76.png",
"scale" : "1x"
},
{
@ -61,8 +67,9 @@
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "83.5x83.5",
"idiom" : "ipad",
"filename" : "2e-130.png",
"scale" : "2x"
}
],

7
Apple2Mac/Apple2iOS/Base.lproj/Main.storyboard
View File

@ -41,7 +41,6 @@
<barButtonItem width="42" style="plain" systemItem="fixedSpace" id="c1a-uF-Awt"/>
<barButtonItem title="Prefs" id="80q-oc-naJ">
<connections>
<action selector="prefsItemSelected:" destination="dkx-z0-nzr" id="L1Z-h1-i72"/>
<segue destination="fYd-cd-QfE" kind="presentation" id="Yi8-iq-9a7"/>
</connections>
</barButtonItem>
@ -153,8 +152,7 @@
<navigationItem key="navigationItem" title="Preferences" id="9q5-Lx-gUn" userLabel="Preferences">
<barButtonItem key="leftBarButtonItem" title="Back" id="9ng-ES-puf">
<connections>
<action selector="goodbye:" destination="tqd-Zi-o6N" id="8Bb-2b-KEk"/>
<segue destination="JAm-8l-9Rz" kind="unwind" unwindAction="unwindToMainViewController:" id="CL2-0r-7P4"/>
<action selector="goodbye:" destination="Bdv-8H-ns5" id="lwk-Ua-aCf"/>
</connections>
</barButtonItem>
</navigationItem>
@ -170,7 +168,6 @@
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="tqd-Zi-o6N" userLabel="First Responder" sceneMemberID="firstResponder"/>
<exit id="JAm-8l-9Rz" userLabel="Exit" sceneMemberID="exit"/>
</objects>
<point key="canvasLocation" x="1567.5" y="-865.14084507042253"/>
</scene>
@ -226,7 +223,7 @@
<navigationItem key="navigationItem" title="Disks" prompt="Choose Disks" id="PHz-oi-44l">
<barButtonItem key="leftBarButtonItem" title="Back" id="IIm-Ae-hIr">
<connections>
<action selector="goodbye:" destination="0hZ-GM-FUh" id="SPE-yU-lXb"/>
<action selector="goodbye:" destination="0hZ-GM-FUh" id="TZh-NX-sKe"/>
</connections>
</barButtonItem>
</navigationItem>

BIN
disks/NSCT.dsk Normal file
View File

Binary file not shown.

BIN
disks/flapple140.po Normal file
View File

Binary file not shown.

BIN
disks/flapple140.po.gz
View File

Binary file not shown.

BIN
disks/mystery.dsk Normal file
View File

Binary file not shown.

BIN
disks/mystery.dsk.gz
View File

Binary file not shown.

2
src/disk.c
View File

@ -747,6 +747,7 @@ const char *disk6_eject(int drive) {
ERRLOG("Error close()ing file %s", disk6.disk[drive].file_name);
}
/*
// foo.dsk -> foo.dsk.gz
err = zlib_deflate(disk6.disk[drive].file_name, is_nib(disk6.disk[drive].file_name) ? NIB_SIZE : DSK_SIZE);
if (err) {
@ -754,6 +755,7 @@ const char *disk6_eject(int drive) {
} else {
unlink(disk6.disk[drive].file_name);
}
*/
}
STRDUP_FREE(disk6.disk[drive].file_name);