Send build products to the correct Xcode locations which works better with the new build system in Xcode

make/head.mk

@@ -12,6 +12,29 @@ TARGETTYPE=shell
 
 SRCDIRS=.
 
+# Check for Xcode build variables for the locations of build outputs and fall back
+# to the current directory if not set.
+ifeq ($(OBJECT_FILE_DIR),)
+    OBJDIR=.
+else
+    export OBJECT_FILE_DIR
+    OBJDIR=$(OBJECT_FILE_DIR)
+endif
+
+ifeq ($(DERIVED_SOURCES_DIR),)
+    GENDIR=.
+else
+    export DERIVED_SOURCES_DIR
+    GENDIR=$(DERIVED_SOURCES_DIR)
+endif
+
+ifeq ($(TARGET_BUILD_DIR),)
+    TARGETDIR=.
+else
+    export TARGET_BUILD_DIR
+    TARGETDIR=$(TARGET_BUILD_DIR)
+endif
+
 COMPILE=make/orca-cc
 CFLAGS= -P -I
 ROOTCFILE=main.c
@@ -35,6 +58,7 @@ CHTYP=$(ORCA) chtyp
 
 RM=rm -f
 CP=cp
+MKDIR=mkdir -p
 
 DESKTOP_RES_MODE=640
 MESSAGE_CENTER=0
@@ -57,6 +81,7 @@ XCODE_PLUGIN_COMPATIBILITY=DVTPlugInCompatibilityUUID
 .PHONY: all gen genclean
 
 all:
+	$(MKDIR) $(OBJDIR) $(GENDIR) $(TARGETDIR)
 	@make gen
 	@make build
 

make/launchEmulator

@@ -16,7 +16,14 @@ then
     exit 1
 fi
 
+DISKIMAGE="$1"
+if echo $DISKIMAGE | grep -v '^/' > /dev/null
+then
+    DISKIMAGE="$PWD/$DISKIMAGE"
+fi
+
 cd make
+sed -i "" "s:^s7d1 *=.*$:s7d1 = $DISKIMAGE:" config.txt
 
 # This magic ensure that clicking stop in Xcode results in the emulator terminating.
 

make/orca-asm

@@ -1,18 +1,77 @@
 #!/bin/bash
 
+TMPFILE=/tmp/orca-macgen.$$
+
 FILENAME="$1"
 shift
 
+DESTBASENAME="$1"
+shift
+
 if echo $FILENAME | grep -v '\.s$' > /dev/null
 then
-    echo Expected first argument to be a *.s file but got $FILENAME
+    echo Expected second argument to be a *.s file but got $FILENAME
     exit 1
 fi
 
+SRCBASENAME=`echo $FILENAME | sed 's/\.s$//'`
+SRCMACROSNAME="${SRCBASENAME}.macros"
+SRCROOTNAME="${SRCBASENAME}.ROOT"
+SRCOBJNAME="${SRCBASENAME}.a"
+
+DESTMACROSNAME="${DESTBASENAME}.macros"
+DESTDEPSNAME="${DESTBASENAME}.macros.d"
+DESTROOTNAME="${DESTBASENAME}.ROOT"
+DESTOBJNAME="${DESTBASENAME}.a"
+
+$ORCA --trace-gsos macgen $MACGENFLAGS "$FILENAME" "$SRCMACROSNAME" $MACGENMACROS < /dev/null 2> $TMPFILE
+RESULT=$?
+
+sed '/^[A-Za-z][A-Za-z]*(.*)$/d' $TMPFILE >&2
+
+if [ "$RESULT" -ne 0 ]
+then
+    rm -f "$TMPFILE"
+    rm -f "$SRCMACROSNAME"
+    exit $RESULT
+fi
+
+DEPS=`awk '
+    /^FastFileLoad/ {
+        sub(/^FastFileLoad\(/, "");
+        sub(/\)$/, "");
+        print}' $TMPFILE | sort -u | while read FILE
+    do
+        if [ -f "$FILE" ]
+        then
+            echo $FILE
+        fi
+    done | tr '\012' ' '`
+
+rm -f $TMPFILE
+
 DIRNAME=`dirname $FILENAME`
 BASENAME=`basename $FILENAME .s`
 
-cd "$DIRNAME"
+pushd "$DIRNAME" > /dev/null
 $ORCA assemble $* keep="${BASENAME}" "${BASENAME}.s"
 RESULT=$?
-exit $RESULT
+popd > /dev/null
+
+if [ "$RESULT" -ne 0 ]
+then
+    rm -f "$SRCROOTNAME"
+    rm -f "$SRCMACROSNAME"
+    rm -f "$SRCOBJNAME"
+fi
+
+mkdir -p `dirname "$DESTROOTNAME"`
+mv -f "$SRCROOTNAME" "$DESTROOTNAME" 2> /dev/null
+mv -f "$SRCMACROSNAME" "$DESTMACROSNAME" 2> /dev/null
+mv -f "$SRCOBJNAME" "$DESTOBJNAME" 2> /dev/null
+
+cat > $DESTDEPSNAME << EOF
+$DESTROOTNAME: $DEPS
+EOF
+
+exit 0

make/orca-cc

@@ -6,6 +6,9 @@ ERROUTPUT=/tmp/orca-cc-errs.$$
 FILENAME="$1"
 shift
 
+DESTBASENAME="$1"
+shift
+
 if echo $FILENAME | grep -v '\.c$' > /dev/null
 then
     echo Expected first argument to be a *.c file but got $FILENAME
@@ -24,12 +27,15 @@ do
     fi
 done
 
-BASENAME=`echo $FILENAME | sed 's/\.c$//'`
+SRCBASENAME=`echo "$FILENAME" | sed 's/\.c$//'`
-DEPSNAME="${BASENAME}.d"
+SRCOBJNAME="${SRCBASENAME}.a"
-OBJSNAME="${BASENAME}.a"
+SRCROOTNAME="${SRCBASENAME}.root"
-ROOTNAME="${BASENAME}.root"
 
-$ORCA --trace-gsos compile $COMPILEARGS "$FILENAME" keep="${BASENAME}" $CCARGS > $STDOUTPUT 2> $ERROUTPUT
+DESTDEPSNAME="${DESTBASENAME}.d"
+DESTOBJNAME="${DESTBASENAME}.a"
+DESTROOTNAME="${DESTBASENAME}.root"
+
+$ORCA --trace-gsos compile $COMPILEARGS "$FILENAME" keep="${SRCBASENAME}" $CCARGS > $STDOUTPUT 2> $ERROUTPUT
 RESULT=$?
 
 awk '
@@ -54,11 +60,15 @@ if [ "$RESULT" -ne 0 ]
 then
     rm -f $ERROUTPUT
     rm -f $STDOUTPUT
-    rm -f $OBJSNAME
+    rm -f $SRCOBJNAME
-    rm -f $ROOTNAME
+    rm -f $SRCROOTNAME
     exit $RESULT
 fi
 
+mkdir -p `dirname "$DESTOBJNAME"`
+mv -f "$SRCOBJNAME" "$DESTOBJNAME" 2> /dev/null
+mv -f "$SRCROOTNAME" "$DESTROOTNAME" 2> /dev/null
+
 DEPS=`awk '
     /^FastFileLoad/ {
         sub(/^FastFileLoad\(/, "");
@@ -76,10 +86,10 @@ rm -f $STDOUTPUT
 
 # We add a dependency for both the .o and the .root file.  If this is the
 # main.c file being compiled, we need the dependency on the .root file.
-cat > $DEPSNAME << EOF
+cat > $DESTDEPSNAME << EOF
-$OBJSNAME: $DEPS
+$DESTOBJNAME: $DEPS
 
-$ROOTNAME: $DEPS
+$DESTROOTNAME: $DEPS
 EOF
 
 exit 0

make/orca-macgen

@@ -1,50 +0,0 @@
-#!/bin/bash
-
-TMPFILE=/tmp/orca-macgen.$$
-
-MACGENFLAGS="$1"
-FILENAME="$2"
-shift
-shift
-
-if echo $FILENAME | grep -v '\.s$' > /dev/null
-then
-    echo Expected second argument to be a *.s file but got $FILENAME
-    exit 1
-fi
-
-BASENAME=`echo $FILENAME | sed 's/\.s$//'`
-MACROSNAME="${BASENAME}.macros"
-DEPSNAME="${MACROSNAME}.d"
-
-$ORCA --trace-gsos macgen $MACGENFLAGS "$FILENAME" $* < /dev/null 2> $TMPFILE
-RESULT=$?
-
-sed '/^[A-Za-z][A-Za-z]*(.*)$/d' $TMPFILE >&2
-
-if [ "$RESULT" -ne 0 ]
-then
-    rm -f $TMPFILE
-    rm -f $MACROSNAME
-    exit $RESULT
-fi
-
-DEPS=`awk '
-    /^FastFileLoad/ {
-        sub(/^FastFileLoad\(/, "");
-        sub(/\)$/, "");
-        print}' $TMPFILE | sort -u | while read FILE
-    do
-        if [ -f "$FILE" ]
-        then
-            echo $FILE
-        fi
-    done | tr '\012' ' '`
-
-rm -f $TMPFILE
-
-cat > $DEPSNAME << EOF
-$MACROSNAME: $DEPS
-EOF
-
-exit 0

make/orca-rez

@@ -5,17 +5,22 @@ ERROUTPUT=/tmp/orca-rez-err.$$
 FILENAME="$1"
 shift
 
+DESTBASENAME="$1"
+shift
+
 if echo $FILENAME | grep -v '\.rez$' > /dev/null
 then
     echo Expected first argument to be a *.rez file but got $FILENAME
     exit 1
 fi
 
-BASENAME=`echo $FILENAME | sed 's/\.rez$//'`
+SRCBASENAME=`echo $FILENAME | sed 's/\.rez$//'`
-DEPSNAME="${BASENAME}.rez.d"
+SRCOBJNAME="${SRCBASENAME}.r"
-OBJSNAME="${BASENAME}.r"
 
-$ORCA --trace-gsos compile "$@" keep="${OBJSNAME}" "$FILENAME" 2> $ERROUTPUT
+DESTDEPSNAME="${DESTBASENAME}.rez.d"
+DESTOBJNAME="${DESTBASENAME}.r"
+
+$ORCA --trace-gsos compile "$@" keep="${SRCOBJNAME}" "$FILENAME" 2> $ERROUTPUT
 RESULT=$?
 
 awk '
@@ -38,10 +43,13 @@ awk '
 if [ "$RESULT" -ne 0 ]
 then
     rm -f $ERROUTPUT
-    rm -f $OBJSNAME
+    rm -f $SRCOBJNAME
     exit $RESULT
 fi
 
+mkdir -p `dirname "$DESTOBJNAME"`
+mv -f "$SRCOBJNAME" "$DESTOBJNAME" 2> /dev/null
+
 DEPS=`awk '
     /^FastFileLoad/ {
         sub(/^FastFileLoad\(/, "");
@@ -54,7 +62,7 @@ DEPS=`awk '
         fi
     done`
 
-echo $OBJSNAME: $DEPS > $DEPSNAME
+echo $DESTOBJNAME: $DEPS > $DESTDEPSNAME
 rm -f $ERROUTPUT
 
 exit 0

make/tail.mk

@@ -6,7 +6,7 @@ export PATH := $(PATH):$(ORCA_BIN)
 
 CWD=$(shell pwd)
 
-DISKIMAGE=$(PGM).2mg
+DISKIMAGE=$(TARGETDIR)/$(PGM).2mg
 BUILDTARGET=$(DISKIMAGE)
 EXECTARGET=executeGUI
 DISKIMAGEDEST=.
@@ -15,7 +15,7 @@ AUXTYPE=
 ifeq ($(TARGETTYPE),shell)
     FILETYPE=exe
     EXECTARGET=executeShell
-    BUILDTARGET=$(PGM)
+    BUILDTARGET=$(TARGETDIR)/$(PGM)
 else ifeq ($(TARGETTYPE),desktop)
     FILETYPE=s16
     ifeq ($(MESSAGE_CENTER),1)
@@ -30,38 +30,39 @@ else ifeq ($(TARGETTYPE),cda)
     FILETYPE=cda
     DISKIMAGEDEST=System/Desk.Accs
 else ifeq ($(TARGETTYPE),cdev)
-    BINTARGET=$(PGM).bin
+    BINTARGET=$(TARGETDIR)/$(PGM).bin
     FILETYPE=199
     DISKIMAGEDEST=System/CDevs
+    REZFLAGS+=rez='-d BINTARGET="$(BINTARGET)"'
 else ifeq ($(TARGETTYPE),nba)
     FILETYPE=exe
-    BUILDTARGET=$(PGM)
+    BUILDTARGET=$(TARGETDIR)/$(PGM)
 else ifeq ($(TARGETTYPE),nda)
     FILETYPE=nda
     DISKIMAGEDEST=System/Desk.Accs
 else ifeq ($(TARGETTYPE),xcmd)
     FILETYPE=exe
-    BUILDTARGET=$(PGM)
+    BUILDTARGET=$(TARGETDIR)/$(PGM)
 endif
 
 ifeq ($(wildcard $(ROOTCFILE)),)
     ROOTCFILE=
 endif
 
-C_ROOTS=$(ROOTCFILE:.c=.root)
+C_ROOTS=$(patsubst %.c, $(OBJDIR)/%.root, $(ROOTCFILE))
 C_SRCS+=$(filter-out $(ROOTCFILE), $(patsubst ./%, %, $(wildcard $(addsuffix /*.c, $(SRCDIRS)))))
-C_OBJS=$(C_SRCS:.c=.a)
+C_OBJS=$(patsubst %.c, $(OBJDIR)/%.a, $(C_SRCS))
-C_DEPS=$(ROOTCFILE:.c=.d) $(C_SRCS:.c=.d)
+C_DEPS=$(patsubst %.c, $(OBJDIR)/%.d, $(ROOTCFILE)) $(patsubst %.c, $(OBJDIR)/%.d, $(C_SRCS))
 
 ASM_SRCS=$(patsubst ./%, %, $(wildcard $(addsuffix /*.s, $(SRCDIRS))))
-ASM_MACROS=$(ASM_SRCS:.s=.macros)
+ASM_MACROS=$(patsubst %.s, $(OBJDIR)/%.macros, $(ASM_SRCS))
-ASM_DEPS=$(ASM_SRCS:.s=.macros.d)
+ASM_DEPS=$(patsubst %.s, $(OBJDIR)/%.macros.d, $(ASM_SRCS))
-ASM_ROOTS=$(ASM_SRCS:.s=.ROOT)
+ASM_ROOTS=$(patsubst %.s, $(OBJDIR)/%.ROOT, $(ASM_SRCS))
-ASM_OBJS=$(ASM_SRCS:.s=.a)
+ASM_OBJS=$(patsubst %.s, $(OBJDIR)/%.a, $(ASM_SRCS))
 
 REZ_SRCS=$(patsubst ./%, %, $(wildcard $(addsuffix /*.rez, $(SRCDIRS))))
-REZ_DEPS=$(REZ_SRCS:.rez=.rez.d)
+REZ_DEPS=$(patsubst %.rez, $(OBJDIR)/%.rez.d, $(REZ_SRCS))
-REZ_OBJS=$(REZ_SRCS:.rez=.r)
+REZ_OBJS=$(patsubst %.rez, $(OBJDIR)/%.r, $(REZ_SRCS))
 
 ifneq ($(firstword $(REZ_SRCS)), $(lastword $(REZ_SRCS)))
     $(error Only a single resource file supported, found $(REZ_SRCS))
@@ -91,7 +92,7 @@ xcodefix:
 	defaults write "$(ORCAM_PLUGIN_INFO)" $(XCODE_PLUGIN_COMPATIBILITY)s -array `defaults read "$(XCODE_INFO)" $(XCODE_PLUGIN_COMPATIBILITY)` || true
 
 clean: genclean
-	$(RM) "$(PGM)" $(BINTARGET)
+	$(RM) "$(TARGETDIR)/$(PGM)" $(BINTARGET)
 	$(RM) $(ALL_OBJS)
 	$(RM) $(ALL_ROOTS)
 	$(RM) $(ALL_DEPS)
@@ -110,13 +111,13 @@ ifeq ($(BINTARGET),)
 # This is a standard build where we generate the resources if any and then link
 # the binary over that same file creating the resource fork first and the data
 # fork second.
-$(PGM): $(BUILD_OBJS)
+$(TARGETDIR)/$(PGM): $(BUILD_OBJS)
 ifneq ($(REZ_OBJS),)
-	$(RM) $(PGM)
+	$(RM) $(TARGETDIR)/$(PGM)
-	$(CP) $(REZ_OBJS) $(PGM)
+	$(CP) $(REZ_OBJS) $(TARGETDIR)/$(PGM)
 endif
-	$(LINK) $(LDFLAGS) $(BUILD_OBJS_NOSUFFIX) --keep=$(PGM)
+	$(LINK) $(LDFLAGS) $(BUILD_OBJS_NOSUFFIX) --keep=$(TARGETDIR)/$(PGM)
-	$(CHTYP) -t $(FILETYPE) $(AUXTYPE) $(PGM)
+	$(CHTYP) -t $(FILETYPE) $(AUXTYPE) $(TARGETDIR)/$(PGM)
 
 else
 
@@ -129,38 +130,35 @@ $(BINTARGET): $(BUILD_OBJS)
 
 $(REZ_OBJS): $(BINTARGET)
 
-$(PGM): $(REZ_OBJS)
+$(TARGETDIR)/$(PGM): $(REZ_OBJS)
-	$(RM) $(PGM)
+	$(RM) $(TARGETDIR)/$(PGM)
-	$(CP) $(REZ_OBJS) $(PGM)
+	$(CP) $(REZ_OBJS) $(TARGETDIR)/$(PGM)
-	$(CHTYP) -t $(FILETYPE) $(AUXTYPE) $(PGM)
+	$(CHTYP) -t $(FILETYPE) $(AUXTYPE) $(TARGETDIR)/$(PGM)
 
 endif
 
-$(DISKIMAGE): $(PGM)
+$(DISKIMAGE): $(TARGETDIR)/$(PGM)
-	make/createDiskImage "$(DISKIMAGE)" "$(PGM)" "$(DISKIMAGEDEST)" $(COPYDIRS)
+	make/createDiskImage "$(DISKIMAGE)" "$(TARGETDIR)/$(PGM)" "$(DISKIMAGEDEST)" $(COPYDIRS)
 
 execute: $(EXECTARGET)
 
 executeGUI: all
-	make/launchEmulator -doit
+	make/launchEmulator $(DISKIMAGE)
 
 executeShell: all
-	$(ORCA) ./$(PGM)
+	$(ORCA) $(TARGETDIR)/$(PGM)
 
-%.a:	%.c
+$(OBJDIR)/%.a:	%.c
-	$(COMPILE) $< $(CFLAGS) --noroot
+	$(COMPILE) $< $(@:.a=) $(CFLAGS) --noroot
 
-%.root:	%.c
+$(OBJDIR)/%.root:	%.c
-	$(COMPILE) $< $(CFLAGS)
+	$(COMPILE) $< $(@:.root=) $(CFLAGS)
 
-%.macros:	%.s
+$(OBJDIR)/%.ROOT:	%.s
-	$(MACGEN) "$(MACGENFLAGS)" $< $@ $(MACGENMACROS)
+	MACGENFLAGS="$(MACGENFLAGS)" MACGENMACROS="$(MACGENMACROS)" $(ASSEMBLE) $< $(@:.ROOT=) $(ASMFLAGS)
 
-%.ROOT:	%.macros
+$(OBJDIR)/%.r:	%.rez
-	$(ASSEMBLE) $(<:.macros=.s) $(ASMFLAGS)
+	$(REZ) $< $(@:.r=) $(REZFLAGS)
-
-%.r:	%.rez
-	$(REZ) $< $(REZFLAGS)
 ifneq ($(RLINT_PATH),)
 	$(ORCA) $(RLINT_PATH) $@
 endif

pkg/Templates/Apple IIgs/ORCAC Classic Desk Accessory.xctemplate/TemplateInfo.plist

@@ -12,7 +12,6 @@
 		<string>make/launchEmulator</string>
                 <string>make/orca-asm</string>
 		<string>make/orca-cc</string>
-		<string>make/orca-macgen</string>
 		<string>make/orca-rez</string>
 		<string>make/system601.2mg</string>
 		<string>make/tail.mk</string>
@@ -67,13 +66,6 @@
 			<key>Path</key>
 			<string>make/orca-cc</string>
 		</dict>
-		<key>make/orca-macgen</key>
-		<dict>
-			<key>Group</key>
-			<string>make</string>
-			<key>Path</key>
-			<string>make/orca-macgen</string>
-		</dict>
 		<key>make/orca-rez</key>
 		<dict>
 			<key>Group</key>

pkg/Templates/Apple IIgs/ORCAC Classic Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme

@@ -64,6 +64,18 @@
             argument = "$PROJECT_DIR/___PACKAGENAME___"
             isEnabled = "YES">
          </CommandLineArgument>
+         <CommandLineArgument
+            argument = "TARGET_BUILD_DIR=$TARGET_BUILD_DIR"
+            isEnabled = "YES">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "DERIVED_SOURCES_DIR=$DERIVED_SOURCES_DIR"
+            isEnabled = "YES">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "OBJECT_FILE_DIR=$OBJECT_FILE_DIR"
+            isEnabled = "YES">
+         </CommandLineArgument>
          <CommandLineArgument
             argument = "execute"
             isEnabled = "YES">

pkg/Templates/Apple IIgs/ORCAC Control Panel.xctemplate/TemplateInfo.plist

@@ -14,7 +14,6 @@
 		<string>make/launchEmulator</string>
                 <string>make/orca-asm</string>
 		<string>make/orca-cc</string>
-		<string>make/orca-macgen</string>
 		<string>make/orca-rez</string>
 		<string>make/system601.2mg</string>
 		<string>make/tail.mk</string>
@@ -79,13 +78,6 @@
 			<key>Path</key>
 			<string>make/orca-cc</string>
 		</dict>
-		<key>make/orca-macgen</key>
-		<dict>
-			<key>Group</key>
-			<string>make</string>
-			<key>Path</key>
-			<string>make/orca-macgen</string>
-		</dict>
 		<key>make/orca-rez</key>
 		<dict>
 			<key>Group</key>

pkg/Templates/Apple IIgs/ORCAC Control Panel.xctemplate/___PACKAGENAME___.xcscheme

@@ -64,6 +64,18 @@
             argument = "$PROJECT_DIR/___PACKAGENAME___"
             isEnabled = "YES">
          </CommandLineArgument>
+         <CommandLineArgument
+            argument = "TARGET_BUILD_DIR=$TARGET_BUILD_DIR"
+            isEnabled = "YES">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "DERIVED_SOURCES_DIR=$DERIVED_SOURCES_DIR"
+            isEnabled = "YES">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "OBJECT_FILE_DIR=$OBJECT_FILE_DIR"
+            isEnabled = "YES">
+         </CommandLineArgument>
          <CommandLineArgument
             argument = "execute"
             isEnabled = "YES">

pkg/Templates/Apple IIgs/ORCAC Control Panel.xctemplate/main.rez

@@ -42,7 +42,7 @@ resource rCDEVFlags (CDEV_RESOURCE) {
 
 
 /* Code resource; the executable part of the CDev */
-read rCDevCode (CDEV_RESOURCE,convert) "___PROJECTNAME___.bin";
+read rCDevCode (CDEV_RESOURCE,convert) BINTARGET;
 
 
 /* This is the icon displayed by the control panel */

pkg/Templates/Apple IIgs/ORCAC Desktop Application.xctemplate/TemplateInfo.plist

@@ -14,7 +14,6 @@
 		<string>make/launchEmulator</string>
                 <string>make/orca-asm</string>
 		<string>make/orca-cc</string>
-		<string>make/orca-macgen</string>
 		<string>make/orca-rez</string>
 		<string>make/system601.2mg</string>
 		<string>make/tail.mk</string>
@@ -79,13 +78,6 @@
 			<key>Path</key>
 			<string>make/orca-cc</string>
 		</dict>
-		<key>make/orca-macgen</key>
-		<dict>
-			<key>Group</key>
-			<string>make</string>
-			<key>Path</key>
-			<string>make/orca-macgen</string>
-		</dict>
 		<key>make/orca-rez</key>
 		<dict>
 			<key>Group</key>

pkg/Templates/Apple IIgs/ORCAC Desktop Application.xctemplate/___PACKAGENAME___.xcscheme

@@ -64,6 +64,18 @@
             argument = "$PROJECT_DIR/___PACKAGENAME___"
             isEnabled = "YES">
          </CommandLineArgument>
+         <CommandLineArgument
+            argument = "TARGET_BUILD_DIR=$TARGET_BUILD_DIR"
+            isEnabled = "YES">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "DERIVED_SOURCES_DIR=$DERIVED_SOURCES_DIR"
+            isEnabled = "YES">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "OBJECT_FILE_DIR=$OBJECT_FILE_DIR"
+            isEnabled = "YES">
+         </CommandLineArgument>
          <CommandLineArgument
             argument = "execute"
             isEnabled = "YES">

pkg/Templates/Apple IIgs/ORCAC GNO Shell Command.xctemplate/TemplateInfo.plist

@@ -9,7 +9,6 @@
 		<string>make/head.mk</string>
                 <string>make/orca-asm</string>
 		<string>make/orca-cc</string>
-		<string>make/orca-macgen</string>
 		<string>make/orca-rez</string>
 		<string>make/tail.mk</string>
                 <string>../___PACKAGENAME___.xcodeproj/xcshareddata/xcschemes/___PACKAGENAME___.xcscheme</string>
@@ -42,13 +41,6 @@
 			<key>Path</key>
 			<string>make/orca-cc</string>
 		</dict>
-		<key>make/orca-macgen</key>
-		<dict>
-			<key>Group</key>
-			<string>make</string>
-			<key>Path</key>
-			<string>make/orca-macgen</string>
-		</dict>
 		<key>make/orca-rez</key>
 		<dict>
 			<key>Group</key>

pkg/Templates/Apple IIgs/ORCAC GNO Shell Command.xctemplate/___PACKAGENAME___.xcscheme

@@ -57,7 +57,7 @@
       </MacroExpansion>
       <CommandLineArguments>
          <CommandLineArgument
-            argument = "$PROJECT_DIR/___PACKAGENAME___/___PACKAGENAME___"
+            argument = "$TARGET_BUILD_DIR/___PACKAGENAME___"
             isEnabled = "YES">
          </CommandLineArgument>
       </CommandLineArguments>

pkg/Templates/Apple IIgs/ORCAC New Desk Accessory.xctemplate/TemplateInfo.plist

@@ -14,7 +14,6 @@
 		<string>make/launchEmulator</string>
                 <string>make/orca-asm</string>
 		<string>make/orca-cc</string>
-		<string>make/orca-macgen</string>
 		<string>make/orca-rez</string>
 		<string>make/system601.2mg</string>
 		<string>make/tail.mk</string>
@@ -79,13 +78,6 @@
 			<key>Path</key>
 			<string>make/orca-cc</string>
 		</dict>
-		<key>make/orca-macgen</key>
-		<dict>
-			<key>Group</key>
-			<string>make</string>
-			<key>Path</key>
-			<string>make/orca-macgen</string>
-		</dict>
 		<key>make/orca-rez</key>
 		<dict>
 			<key>Group</key>

pkg/Templates/Apple IIgs/ORCAC New Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme

@@ -64,6 +64,18 @@
             argument = "$PROJECT_DIR/___PACKAGENAME___"
             isEnabled = "YES">
          </CommandLineArgument>
+         <CommandLineArgument
+            argument = "TARGET_BUILD_DIR=$TARGET_BUILD_DIR"
+            isEnabled = "YES">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "DERIVED_SOURCES_DIR=$DERIVED_SOURCES_DIR"
+            isEnabled = "YES">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "OBJECT_FILE_DIR=$OBJECT_FILE_DIR"
+            isEnabled = "YES">
+         </CommandLineArgument>
          <CommandLineArgument
             argument = "execute"
             isEnabled = "YES">

pkg/Templates/Apple IIgs/ORCAC Shell Command.xctemplate/TemplateInfo.plist

@@ -9,7 +9,6 @@
 		<string>make/head.mk</string>
                 <string>make/orca-asm</string>
 		<string>make/orca-cc</string>
-		<string>make/orca-macgen</string>
 		<string>make/orca-rez</string>
 		<string>make/tail.mk</string>
                 <string>../___PACKAGENAME___.xcodeproj/xcshareddata/xcschemes/___PACKAGENAME___.xcscheme</string>
@@ -42,13 +41,6 @@
 			<key>Path</key>
 			<string>make/orca-cc</string>
 		</dict>
-		<key>make/orca-macgen</key>
-		<dict>
-			<key>Group</key>
-			<string>make</string>
-			<key>Path</key>
-			<string>make/orca-macgen</string>
-		</dict>
 		<key>make/orca-rez</key>
 		<dict>
 			<key>Group</key>

pkg/Templates/Apple IIgs/ORCAC Shell Command.xctemplate/___PACKAGENAME___.xcscheme

@@ -57,7 +57,7 @@
       </MacroExpansion>
       <CommandLineArguments>
          <CommandLineArgument
-            argument = "$PROJECT_DIR/___PACKAGENAME___/___PACKAGENAME___"
+            argument = "$TARGET_BUILD_DIR/___PACKAGENAME___"
             isEnabled = "YES">
          </CommandLineArgument>
       </CommandLineArguments>

pkg/Templates/Apple IIgs/ORCAM Classic Desk Accessory.xctemplate/TemplateInfo.plist

@@ -12,7 +12,6 @@
 		<string>make/launchEmulator</string>
                 <string>make/orca-asm</string>
 		<string>make/orca-cc</string>
-		<string>make/orca-macgen</string>
 		<string>make/orca-rez</string>
 		<string>make/system601.2mg</string>
 		<string>make/tail.mk</string>
@@ -67,13 +66,6 @@
 			<key>Path</key>
 			<string>make/orca-cc</string>
 		</dict>
-		<key>make/orca-macgen</key>
-		<dict>
-			<key>Group</key>
-			<string>make</string>
-			<key>Path</key>
-			<string>make/orca-macgen</string>
-		</dict>
 		<key>make/orca-rez</key>
 		<dict>
 			<key>Group</key>

pkg/Templates/Apple IIgs/ORCAM Classic Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme

@@ -64,6 +64,18 @@
             argument = "$PROJECT_DIR/___PACKAGENAME___"
             isEnabled = "YES">
          </CommandLineArgument>
+         <CommandLineArgument
+            argument = "TARGET_BUILD_DIR=$TARGET_BUILD_DIR"
+            isEnabled = "YES">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "DERIVED_SOURCES_DIR=$DERIVED_SOURCES_DIR"
+            isEnabled = "YES">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "OBJECT_FILE_DIR=$OBJECT_FILE_DIR"
+            isEnabled = "YES">
+         </CommandLineArgument>
          <CommandLineArgument
             argument = "execute"
             isEnabled = "YES">

pkg/Templates/Apple IIgs/ORCAM Control Panel.xctemplate/TemplateInfo.plist

@@ -13,7 +13,6 @@
 		<string>make/launchEmulator</string>
                 <string>make/orca-asm</string>
 		<string>make/orca-cc</string>
-		<string>make/orca-macgen</string>
 		<string>make/orca-rez</string>
 		<string>make/system601.2mg</string>
 		<string>make/tail.mk</string>
@@ -73,13 +72,6 @@
 			<key>Path</key>
 			<string>make/orca-cc</string>
 		</dict>
-		<key>make/orca-macgen</key>
-		<dict>
-			<key>Group</key>
-			<string>make</string>
-			<key>Path</key>
-			<string>make/orca-macgen</string>
-		</dict>
 		<key>make/orca-rez</key>
 		<dict>
 			<key>Group</key>

pkg/Templates/Apple IIgs/ORCAM Control Panel.xctemplate/___PACKAGENAME___.xcscheme

@@ -64,6 +64,18 @@
             argument = "$PROJECT_DIR/___PACKAGENAME___"
             isEnabled = "YES">
          </CommandLineArgument>
+         <CommandLineArgument
+            argument = "TARGET_BUILD_DIR=$TARGET_BUILD_DIR"
+            isEnabled = "YES">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "DERIVED_SOURCES_DIR=$DERIVED_SOURCES_DIR"
+            isEnabled = "YES">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "OBJECT_FILE_DIR=$OBJECT_FILE_DIR"
+            isEnabled = "YES">
+         </CommandLineArgument>
          <CommandLineArgument
             argument = "execute"
             isEnabled = "YES">

pkg/Templates/Apple IIgs/ORCAM Control Panel.xctemplate/main.rez

@@ -45,7 +45,7 @@ resource rCDEVFlags (CDEV_RESOURCE) {
 
 
 /* Code resource; the executable part of the CDev */
-read rCDevCode (CDEV_RESOURCE,convert) "___PROJECTNAME___.bin";
+read rCDevCode (CDEV_RESOURCE,convert) BINTARGET;
 
 
 /* This is the icon displayed by the control panel */

pkg/Templates/Apple IIgs/ORCAM Desktop Application.xctemplate/TemplateInfo.plist

@@ -13,7 +13,6 @@
 		<string>make/launchEmulator</string>
                 <string>make/orca-asm</string>
 		<string>make/orca-cc</string>
-		<string>make/orca-macgen</string>
 		<string>make/orca-rez</string>
 		<string>make/system601.2mg</string>
 		<string>make/tail.mk</string>
@@ -73,13 +72,6 @@
 			<key>Path</key>
 			<string>make/orca-cc</string>
 		</dict>
-		<key>make/orca-macgen</key>
-		<dict>
-			<key>Group</key>
-			<string>make</string>
-			<key>Path</key>
-			<string>make/orca-macgen</string>
-		</dict>
 		<key>make/orca-rez</key>
 		<dict>
 			<key>Group</key>

pkg/Templates/Apple IIgs/ORCAM Desktop Application.xctemplate/___PACKAGENAME___.xcscheme

@@ -64,6 +64,18 @@
             argument = "$PROJECT_DIR/___PACKAGENAME___"
             isEnabled = "YES">
          </CommandLineArgument>
+         <CommandLineArgument
+            argument = "TARGET_BUILD_DIR=$TARGET_BUILD_DIR"
+            isEnabled = "YES">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "DERIVED_SOURCES_DIR=$DERIVED_SOURCES_DIR"
+            isEnabled = "YES">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "OBJECT_FILE_DIR=$OBJECT_FILE_DIR"
+            isEnabled = "YES">
+         </CommandLineArgument>
          <CommandLineArgument
             argument = "execute"
             isEnabled = "YES">

pkg/Templates/Apple IIgs/ORCAM New Desk Accessory.xctemplate/TemplateInfo.plist

@@ -13,7 +13,6 @@
 		<string>make/launchEmulator</string>
                 <string>make/orca-asm</string>
 		<string>make/orca-cc</string>
-		<string>make/orca-macgen</string>
 		<string>make/orca-rez</string>
 		<string>make/system601.2mg</string>
 		<string>make/tail.mk</string>
@@ -73,13 +72,6 @@
 			<key>Path</key>
 			<string>make/orca-cc</string>
 		</dict>
-		<key>make/orca-macgen</key>
-		<dict>
-			<key>Group</key>
-			<string>make</string>
-			<key>Path</key>
-			<string>make/orca-macgen</string>
-		</dict>
 		<key>make/orca-rez</key>
 		<dict>
 			<key>Group</key>

pkg/Templates/Apple IIgs/ORCAM New Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme

@@ -64,6 +64,18 @@
             argument = "$PROJECT_DIR/___PACKAGENAME___"
             isEnabled = "YES">
          </CommandLineArgument>
+         <CommandLineArgument
+            argument = "TARGET_BUILD_DIR=$TARGET_BUILD_DIR"
+            isEnabled = "YES">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "DERIVED_SOURCES_DIR=$DERIVED_SOURCES_DIR"
+            isEnabled = "YES">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "OBJECT_FILE_DIR=$OBJECT_FILE_DIR"
+            isEnabled = "YES">
+         </CommandLineArgument>
          <CommandLineArgument
             argument = "execute"
             isEnabled = "YES">

pkg/Templates/Apple IIgs/ORCAM Shell Command.xctemplate/TemplateInfo.plist

@@ -9,7 +9,6 @@
 		<string>make/head.mk</string>
 		<string>make/orca-asm</string>
 		<string>make/orca-cc</string>
-		<string>make/orca-macgen</string>
 		<string>make/orca-rez</string>
 		<string>make/tail.mk</string>
                 <string>../___PACKAGENAME___.xcodeproj/xcshareddata/xcschemes/___PACKAGENAME___.xcscheme</string>
@@ -42,13 +41,6 @@
 			<key>Path</key>
 			<string>make/orca-cc</string>
 		</dict>
-		<key>make/orca-macgen</key>
-		<dict>
-			<key>Group</key>
-			<string>make</string>
-			<key>Path</key>
-			<string>make/orca-macgen</string>
-		</dict>
 		<key>make/orca-rez</key>
 		<dict>
 			<key>Group</key>

pkg/Templates/Apple IIgs/ORCAM Shell Command.xctemplate/___PACKAGENAME___.xcscheme

@@ -57,7 +57,7 @@
       </MacroExpansion>
       <CommandLineArguments>
          <CommandLineArgument
-            argument = "$PROJECT_DIR/___PACKAGENAME___/___PACKAGENAME___"
+            argument = "$TARGET_BUILD_DIR/___PACKAGENAME___"
             isEnabled = "YES">
          </CommandLineArgument>
       </CommandLineArguments>