diff --git a/BuGS.xcodeproj/project.pbxproj b/BuGS.xcodeproj/project.pbxproj index 1546e26..0e2172c 100644 --- a/BuGS.xcodeproj/project.pbxproj +++ b/BuGS.xcodeproj/project.pbxproj @@ -96,6 +96,7 @@ 9D3396FF24AED09D003222B3 /* sprites.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = sprites.md; sourceTree = ""; }; 9D33970024AEFBF2003222B3 /* segments.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = segments.s; sourceTree = ""; }; 9D33970124AF9D55003222B3 /* sprites.macros */ = {isa = PBXFileReference; lastKnownFileType = text; path = sprites.macros; sourceTree = ""; }; + 9D40049726575A8100478FB2 /* system601_net.2mg */ = {isa = PBXFileReference; lastKnownFileType = file; path = system601_net.2mg; sourceTree = ""; }; 9D47CBE02547BEDB00CDA5CB /* gameMushroom.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = gameMushroom.s; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.asm.orcam; }; 9D47CC14254A698900CDA5CB /* gamePlayer.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = gamePlayer.s; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.asm.orcam; }; 9D47CCBA25525C1A00CDA5CB /* genData.pl */ = {isa = PBXFileReference; lastKnownFileType = text.script.perl; path = genData.pl; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.perl; }; @@ -240,6 +241,7 @@ 9D1716A02491C49300C83148 /* orca-cc */, 9D1716A22491C49300C83148 /* orca-rez */, 9D1716A42491C49300C83148 /* system601.2mg */, + 9D40049726575A8100478FB2 /* system601_net.2mg */, 9D1716A62491C49300C83148 /* tail.mk */, ); path = make; diff --git a/BuGS.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/xcschememanagement.plist b/BuGS.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/xcschememanagement.plist index 1ebd7b3..c7870af 100644 --- a/BuGS.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/BuGS.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/xcschememanagement.plist @@ -17,12 +17,12 @@ DiskImage.xcscheme_^#shared#^_ orderHint - 3 + 2 doNotBuild.xcscheme_^#shared#^_ orderHint - 2 + 3 diff --git a/BuGS/make/config.txt b/BuGS/make/config.txt index c3ca46f..f86b0be 100644 --- a/BuGS/make/config.txt +++ b/BuGS/make/config.txt @@ -6,9 +6,11 @@ s5d2 = s6d1 = s6d2 = -s7d1 = /Users/jrand/Coding/AppleCoding/Apple2GS/BuGS/BuGS/make/system601.2mg +s7d1 = /Users/jrand/Coding/AppleCoding/Apple2GS/BuGS/BuGS/make/system601_net.2mg +g_ethernet = 1 g_limit_speed = 3 +g_ethernet = 1 bram1[00] = 00 00 00 01 00 00 0d 06 02 01 01 00 01 00 00 00 diff --git a/BuGS/make/launchEmulator b/BuGS/make/launchEmulator index af8deaf..2b5dc40 100755 --- a/BuGS/make/launchEmulator +++ b/BuGS/make/launchEmulator @@ -29,7 +29,7 @@ then fi # This magic ensures that clicking stop in Xcode results in the emulator terminating. -if true +if false then cd make sed -i "" "s:^s7d1 *=.*$:s7d1 = $BOOTIMAGE: @@ -38,7 +38,7 @@ s:^s5d1 *=.*:s5d1 = $DISKIMAGE:" config.txt PID=$! else cd "/Users/jrand/Library/Application Support/Ample" - /Applications/Ample.app/Contents/MacOS/mame64 apple2gs -skip_gameinfo -mouse -window -resolution 1408x1056 -ramsize 4M -sl7 cffa202 -hard1 "$BOOTIMAGE" -flop3 "$DISKIMAGE" & + /Applications/Ample.app/Contents/MacOS/mame64 apple2gs -skip_gameinfo -mouse -window -resolution 1408x1056 -ramsize 4M -sl3 uthernet -sl7 cffa2 -hard1 "$BOOTIMAGE" -flop3 "$DISKIMAGE" & PID=$! fi diff --git a/BuGS/make/system601_net.2mg b/BuGS/make/system601_net.2mg new file mode 100644 index 0000000..546cb29 Binary files /dev/null and b/BuGS/make/system601_net.2mg differ diff --git a/BuGS/make/tail.mk b/BuGS/make/tail.mk index c129fd9..68048ff 100644 --- a/BuGS/make/tail.mk +++ b/BuGS/make/tail.mk @@ -184,7 +184,7 @@ $(DISKIMAGE): $(TARGETDIR)/$(PGM) execute: $(EXECTARGET) executeGUI: all - make/launchEmulator make/system601.2mg $(DISKIMAGE) + make/launchEmulator make/system601_net.2mg $(DISKIMAGE) executeShell: all $(ORCA) $(TARGETDIR)/$(PGM)