diff --git a/Makefile b/Makefile
index 8008855..4e1df05 100644
--- a/Makefile
+++ b/Makefile
@@ -55,5 +55,15 @@ ASMFLAGS+=
# Add any arguments you want passed to the linker to this variable:
LDFLAGS+=
+# By default, the build expects that you have GSplus in the path:
+# /Applications/GSplus.app/Contents/MacOS/gsplus
+# If you have it in a different location, specify that here.
+# GSPLUS=/Applications/GSplus.app/Contents/MacOS/gsplus
+
+# By default, the build expects that you have GSport in the path:
+# /Applications/GSport/GSport.app/Contents/MacOS/GSport
+# If you have it in a different location, specify that here.
+# GSPORT=/Applications/GSport/GSport.app/Contents/MacOS/GSport
+
# Do not change anything else below here...
include make/tail.mk
diff --git a/make/head.mk b/make/head.mk
index 1d7e7c4..7f985f0 100644
--- a/make/head.mk
+++ b/make/head.mk
@@ -37,3 +37,9 @@ CHTYP=$(ORCA) chtyp
RM=rm -f
CP=cp
+
+GSPLUS=/Applications/GSplus.app/Contents/MacOS/gsplus
+GSPORT=/Applications/GSport/GSport.app/Contents/MacOS/GSport
+
+export GSPLUS
+export GSPORT
diff --git a/make/tail.mk b/make/tail.mk
index 0213e19..08a453a 100644
--- a/make/tail.mk
+++ b/make/tail.mk
@@ -6,21 +6,31 @@ export PATH := $(PATH):$(ORCA_BIN)
CWD=$(shell pwd)
+DISKIMAGE=$(PGM).2mg
+ALLTARGET=execute
+DISKIMAGEDEST=.
+
ifeq ($(TARGETTYPE),shell)
FILETYPE=exe
+ ALLTARGET=$(PGM)
else ifeq ($(TARGETTYPE),desktop)
FILETYPE=s16
else ifeq ($(TARGETTYPE),cda)
FILETYPE=cda
+ DISKIMAGEDEST=System/Desk.Accs
else ifeq ($(TARGETTYPE),cdev)
BINTARGET=$(PGM).bin
FILETYPE=199
+ DISKIMAGEDEST=System/CDevs
else ifeq ($(TARGETTYPE),nba)
FILETYPE=exe
+ ALLTARGET=$(PGM)
else ifeq ($(TARGETTYPE),nda)
FILETYPE=nda
+ DISKIMAGEDEST=System/Desk.Accs
else ifeq ($(TARGETTYPE),xcmd)
FILETYPE=exe
+ ALLTARGET=$(PGM)
endif
ifeq ($(wildcard $(ROOTCFILE)),)
@@ -58,14 +68,6 @@ ALL_DEPS=$(C_DEPS) $(ASM_DEPS) $(REZ_DEPS)
EXECCMD=
-#ALLTARGET=$(DISKIMAGE)
-#ifeq ($(TARGETTYPE),shell)
-# ALLTARGET=execute
-#else
-# ALLTARGET=$(PGM)
-#endif
-ALLTARGET=$(PGM)
-
.PHONY: all execute clean
.PRECIOUS: $(ASM_MACROS)
@@ -78,7 +80,7 @@ clean:
$(RM) $(ALL_ROOTS)
$(RM) $(ALL_DEPS)
$(RM) $(ASM_MACROS)
-# $(RM) "$(DISKIMAGE)"
+ $(RM) "$(DISKIMAGE)"
createPackage:
pkg/createPackage
@@ -118,13 +120,13 @@ $(PGM): $(REZ_OBJS)
endif
-#$(DISKIMAGE): $(PGM)
-# make/createDiskImage $(AC) $(MACHINE) "$(DISKIMAGE)" "$(PGM)" "$(START_ADDR)"
+$(DISKIMAGE): $(PGM)
+ make/createDiskImage "$(DISKIMAGE)" "$(PGM)" "$(DISKIMAGEDEST)"
-#execute: $(DISKIMAGE)
-# osascript make/V2Make.scpt "$(CWD)" "$(PGM)" "$(CWD)/make/DevApple.vii" "$(EXECCMD)"
+execute: $(DISKIMAGE)
+ make/launchEmulator
-execute: $(PGM)
+executeShell: $(PGM)
$(ORCA) $(PGM)
%.a: %.c
diff --git a/pkg/Templates/Apple IIgs/Classic Desk Accessory in C.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/Classic Desk Accessory in C.xctemplate/TemplateInfo.plist
index 070e708..367837b 100644
--- a/pkg/Templates/Apple IIgs/Classic Desk Accessory in C.xctemplate/TemplateInfo.plist
+++ b/pkg/Templates/Apple IIgs/Classic Desk Accessory in C.xctemplate/TemplateInfo.plist
@@ -6,11 +6,15 @@
main.c
Makefile
+ make/config.txt
+ make/createDiskImage
make/head.mk
+ make/launchEmulator
make/orca-asm
make/orca-cc
make/orca-macgen
make/orca-rez
+ make/system601.2mg
make/tail.mk
Definitions
@@ -20,6 +24,20 @@
Path
main.c
+ make/config.txt
+
+ Group
+ make
+ Path
+ make/config.txt
+
+ make/createDiskImage
+
+ Group
+ make
+ Path
+ make/createDiskImage
+
make/head.mk
Group
@@ -27,6 +45,13 @@
Path
make/head.mk
+ make/launchEmulator
+
+ Group
+ make
+ Path
+ make/launchEmulator
+
make/orca-asm
Group
@@ -55,6 +80,13 @@
Path
make/orca-rez
+ make/system601.2mg
+
+ Group
+ make
+ Path
+ make/system601.2mg
+
make/tail.mk
Group
diff --git a/pkg/Templates/Apple IIgs/Control Panel in C.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/Control Panel in C.xctemplate/TemplateInfo.plist
index 7b8675f..045e5fd 100644
--- a/pkg/Templates/Apple IIgs/Control Panel in C.xctemplate/TemplateInfo.plist
+++ b/pkg/Templates/Apple IIgs/Control Panel in C.xctemplate/TemplateInfo.plist
@@ -8,11 +8,15 @@
main.h
main.rez
Makefile
+ make/config.txt
+ make/createDiskImage
make/head.mk
+ make/launchEmulator
make/orca-asm
make/orca-cc
make/orca-macgen
make/orca-rez
+ make/system601.2mg
make/tail.mk
Definitions
@@ -32,6 +36,20 @@
Path
main.rez
+ make/config.txt
+
+ Group
+ make
+ Path
+ make/config.txt
+
+ make/createDiskImage
+
+ Group
+ make
+ Path
+ make/createDiskImage
+
make/head.mk
Group
@@ -39,6 +57,13 @@
Path
make/head.mk
+ make/launchEmulator
+
+ Group
+ make
+ Path
+ make/launchEmulator
+
make/orca-asm
Group
@@ -67,6 +92,13 @@
Path
make/orca-rez
+ make/system601.2mg
+
+ Group
+ make
+ Path
+ make/system601.2mg
+
make/tail.mk
Group
diff --git a/pkg/Templates/Apple IIgs/Desktop Application in C.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/Desktop Application in C.xctemplate/TemplateInfo.plist
index abab725..ce907bb 100644
--- a/pkg/Templates/Apple IIgs/Desktop Application in C.xctemplate/TemplateInfo.plist
+++ b/pkg/Templates/Apple IIgs/Desktop Application in C.xctemplate/TemplateInfo.plist
@@ -8,11 +8,15 @@
main.h
main.rez
Makefile
+ make/config.txt
+ make/createDiskImage
make/head.mk
+ make/launchEmulator
make/orca-asm
make/orca-cc
make/orca-macgen
make/orca-rez
+ make/system601.2mg
make/tail.mk
Definitions
@@ -32,6 +36,20 @@
Path
main.rez
+ make/config.txt
+
+ Group
+ make
+ Path
+ make/config.txt
+
+ make/createDiskImage
+
+ Group
+ make
+ Path
+ make/createDiskImage
+
make/head.mk
Group
@@ -39,6 +57,13 @@
Path
make/head.mk
+ make/launchEmulator
+
+ Group
+ make
+ Path
+ make/launchEmulator
+
make/orca-asm
Group
@@ -67,6 +92,13 @@
Path
make/orca-rez
+ make/system601.2mg
+
+ Group
+ make
+ Path
+ make/system601.2mg
+
make/tail.mk
Group
diff --git a/pkg/Templates/Apple IIgs/New Desk Accessory in C.xctemplate/TemplateInfo.plist b/pkg/Templates/Apple IIgs/New Desk Accessory in C.xctemplate/TemplateInfo.plist
index c30cea2..7eabf6d 100644
--- a/pkg/Templates/Apple IIgs/New Desk Accessory in C.xctemplate/TemplateInfo.plist
+++ b/pkg/Templates/Apple IIgs/New Desk Accessory in C.xctemplate/TemplateInfo.plist
@@ -8,11 +8,15 @@
main.h
main.rez
Makefile
+ make/config.txt
+ make/createDiskImage
make/head.mk
+ make/launchEmulator
make/orca-asm
make/orca-cc
make/orca-macgen
make/orca-rez
+ make/system601.2mg
make/tail.mk
Definitions
@@ -32,6 +36,20 @@
Path
main.rez
+ make/config.txt
+
+ Group
+ make
+ Path
+ make/config.txt
+
+ make/createDiskImage
+
+ Group
+ make
+ Path
+ make/createDiskImage
+
make/head.mk
Group
@@ -39,6 +57,13 @@
Path
make/head.mk
+ make/launchEmulator
+
+ Group
+ make
+ Path
+ make/launchEmulator
+
make/orca-asm
Group
@@ -67,6 +92,13 @@
Path
make/orca-rez
+ make/system601.2mg
+
+ Group
+ make
+ Path
+ make/system601.2mg
+
make/tail.mk
Group