From 83420e38608dd14dc553d122ce0b5325bdebcf7e Mon Sep 17 00:00:00 2001
From: Jeremy Rand <jeremy@rand-family.com>
Date: Thu, 26 Nov 2020 18:05:34 -0500
Subject: [PATCH] A different take on fixing the problem with relative OBJDIR
 and some fixes for spaces in the path to the project

---
 make/tail.mk                                             | 9 +++------
 .../___PACKAGENAME___.xcscheme                           | 2 +-
 .../___PACKAGENAME___.xcscheme                           | 2 +-
 .../___PACKAGENAME___.xcscheme                           | 2 +-
 .../___PACKAGENAME___.xcscheme                           | 2 +-
 .../___PACKAGENAME___.xcscheme                           | 2 +-
 .../___PACKAGENAME___.xcscheme                           | 2 +-
 .../___PACKAGENAME___.xcscheme                           | 2 +-
 .../___PACKAGENAME___.xcscheme                           | 2 +-
 .../___PACKAGENAME___.xcscheme                           | 2 +-
 .../___PACKAGENAME___.xcscheme                           | 2 +-
 .../___PACKAGENAME___.xcscheme                           | 2 +-
 12 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/make/tail.mk b/make/tail.mk
index 4b523c6..491608c 100644
--- a/make/tail.mk
+++ b/make/tail.mk
@@ -5,9 +5,6 @@
 export PATH := $(PATH):$(ORCA_BIN)
 
 CWD=$(shell pwd)
-OBJDIR:=$(abspath $(OBJDIR))
-GENDIR:=$(abspath $(GENDIR))
-TARGETDIR:=$(abspath $(TARGETDIR))
 
 DISKIMAGE=$(TARGETDIR)/$(PGM).2mg
 BUILDTARGET=$(DISKIMAGE)
@@ -128,7 +125,7 @@ ifneq ($(REZ_OBJS),)
 	$(RM) $(TARGETDIR)/$(PGM)
 	$(CP) $(REZ_OBJS) $(TARGETDIR)/$(PGM)
 endif
-	cd $(OBJDIR); $(LINK) $(LDFLAGS) $(patsubst $(OBJDIR)/%, %, $(BUILD_OBJS_NOSUFFIX)) keep=$(TARGETDIR)/$(PGM)
+	cd $(OBJDIR); $(LINK) $(LDFLAGS) $(patsubst $(OBJDIR)/%, %, $(BUILD_OBJS_NOSUFFIX)) keep="$(abspath $(TARGETDIR)/$(PGM))"
 	$(CHTYP) -t $(FILETYPE) $(AUXTYPE) $(TARGETDIR)/$(PGM)
 
     endif
@@ -157,7 +154,7 @@ else
 # resource compile will read the $(PGM).bin binary and load it into the
 # resources also.
 $(BINTARGET): $(BUILD_OBJS)
-	cd $(OBJDIR); $(LINK) $(LDFLAGS) $(patsubst $(OBJDIR)/%, %, $(BUILD_OBJS_NOSUFFIX)) keep=$(BINTARGET)
+	cd $(OBJDIR); $(LINK) $(LDFLAGS) $(patsubst $(OBJDIR)/%, %, $(BUILD_OBJS_NOSUFFIX)) keep="$(abspath $(BINTARGET))"
 
     endif
 
@@ -187,7 +184,7 @@ $(DISKIMAGE): $(TARGETDIR)/$(PGM)
 execute: $(EXECTARGET)
 
 executeGUI: all
-	make/launchEmulator $(DISKIMAGE)
+	make/launchEmulator "$(DISKIMAGE)"
 
 executeShell: all
 	$(ORCA) $(TARGETDIR)/$(PGM)
diff --git a/pkg/Templates/Apple IIgs/Merlin Classic Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme b/pkg/Templates/Apple IIgs/Merlin Classic Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme
index ef0c34f..09443c4 100644
--- a/pkg/Templates/Apple IIgs/Merlin Classic Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme	
+++ b/pkg/Templates/Apple IIgs/Merlin Classic Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme	
@@ -61,7 +61,7 @@
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "$PROJECT_DIR/___PACKAGENAME___"
+            argument = "&quot;$PROJECT_DIR/___PACKAGENAME___&quot;""
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
diff --git a/pkg/Templates/Apple IIgs/Merlin Control Panel.xctemplate/___PACKAGENAME___.xcscheme b/pkg/Templates/Apple IIgs/Merlin Control Panel.xctemplate/___PACKAGENAME___.xcscheme
index ef0c34f..a89e25e 100644
--- a/pkg/Templates/Apple IIgs/Merlin Control Panel.xctemplate/___PACKAGENAME___.xcscheme	
+++ b/pkg/Templates/Apple IIgs/Merlin Control Panel.xctemplate/___PACKAGENAME___.xcscheme	
@@ -61,7 +61,7 @@
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "$PROJECT_DIR/___PACKAGENAME___"
+            argument = "&quot;$PROJECT_DIR/___PACKAGENAME___&quot;"
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
diff --git a/pkg/Templates/Apple IIgs/Merlin Desktop Application.xctemplate/___PACKAGENAME___.xcscheme b/pkg/Templates/Apple IIgs/Merlin Desktop Application.xctemplate/___PACKAGENAME___.xcscheme
index ef0c34f..a89e25e 100644
--- a/pkg/Templates/Apple IIgs/Merlin Desktop Application.xctemplate/___PACKAGENAME___.xcscheme	
+++ b/pkg/Templates/Apple IIgs/Merlin Desktop Application.xctemplate/___PACKAGENAME___.xcscheme	
@@ -61,7 +61,7 @@
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "$PROJECT_DIR/___PACKAGENAME___"
+            argument = "&quot;$PROJECT_DIR/___PACKAGENAME___&quot;"
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
diff --git a/pkg/Templates/Apple IIgs/Merlin New Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme b/pkg/Templates/Apple IIgs/Merlin New Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme
index ef0c34f..a89e25e 100644
--- a/pkg/Templates/Apple IIgs/Merlin New Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme	
+++ b/pkg/Templates/Apple IIgs/Merlin New Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme	
@@ -61,7 +61,7 @@
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "$PROJECT_DIR/___PACKAGENAME___"
+            argument = "&quot;$PROJECT_DIR/___PACKAGENAME___&quot;"
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
diff --git a/pkg/Templates/Apple IIgs/ORCAC Classic Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme b/pkg/Templates/Apple IIgs/ORCAC Classic Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme
index ef0c34f..a89e25e 100644
--- a/pkg/Templates/Apple IIgs/ORCAC Classic Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme	
+++ b/pkg/Templates/Apple IIgs/ORCAC Classic Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme	
@@ -61,7 +61,7 @@
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "$PROJECT_DIR/___PACKAGENAME___"
+            argument = "&quot;$PROJECT_DIR/___PACKAGENAME___&quot;"
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
diff --git a/pkg/Templates/Apple IIgs/ORCAC Control Panel.xctemplate/___PACKAGENAME___.xcscheme b/pkg/Templates/Apple IIgs/ORCAC Control Panel.xctemplate/___PACKAGENAME___.xcscheme
index ef0c34f..a89e25e 100644
--- a/pkg/Templates/Apple IIgs/ORCAC Control Panel.xctemplate/___PACKAGENAME___.xcscheme	
+++ b/pkg/Templates/Apple IIgs/ORCAC Control Panel.xctemplate/___PACKAGENAME___.xcscheme	
@@ -61,7 +61,7 @@
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "$PROJECT_DIR/___PACKAGENAME___"
+            argument = "&quot;$PROJECT_DIR/___PACKAGENAME___&quot;"
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
diff --git a/pkg/Templates/Apple IIgs/ORCAC Desktop Application.xctemplate/___PACKAGENAME___.xcscheme b/pkg/Templates/Apple IIgs/ORCAC Desktop Application.xctemplate/___PACKAGENAME___.xcscheme
index ef0c34f..a89e25e 100644
--- a/pkg/Templates/Apple IIgs/ORCAC Desktop Application.xctemplate/___PACKAGENAME___.xcscheme	
+++ b/pkg/Templates/Apple IIgs/ORCAC Desktop Application.xctemplate/___PACKAGENAME___.xcscheme	
@@ -61,7 +61,7 @@
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "$PROJECT_DIR/___PACKAGENAME___"
+            argument = "&quot;$PROJECT_DIR/___PACKAGENAME___&quot;"
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
diff --git a/pkg/Templates/Apple IIgs/ORCAC New Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme b/pkg/Templates/Apple IIgs/ORCAC New Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme
index ef0c34f..a89e25e 100644
--- a/pkg/Templates/Apple IIgs/ORCAC New Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme	
+++ b/pkg/Templates/Apple IIgs/ORCAC New Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme	
@@ -61,7 +61,7 @@
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "$PROJECT_DIR/___PACKAGENAME___"
+            argument = "&quot;$PROJECT_DIR/___PACKAGENAME___&quot;"
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
diff --git a/pkg/Templates/Apple IIgs/ORCAM Classic Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme b/pkg/Templates/Apple IIgs/ORCAM Classic Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme
index ef0c34f..a89e25e 100644
--- a/pkg/Templates/Apple IIgs/ORCAM Classic Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme	
+++ b/pkg/Templates/Apple IIgs/ORCAM Classic Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme	
@@ -61,7 +61,7 @@
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "$PROJECT_DIR/___PACKAGENAME___"
+            argument = "&quot;$PROJECT_DIR/___PACKAGENAME___&quot;"
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
diff --git a/pkg/Templates/Apple IIgs/ORCAM Control Panel.xctemplate/___PACKAGENAME___.xcscheme b/pkg/Templates/Apple IIgs/ORCAM Control Panel.xctemplate/___PACKAGENAME___.xcscheme
index ef0c34f..a89e25e 100644
--- a/pkg/Templates/Apple IIgs/ORCAM Control Panel.xctemplate/___PACKAGENAME___.xcscheme	
+++ b/pkg/Templates/Apple IIgs/ORCAM Control Panel.xctemplate/___PACKAGENAME___.xcscheme	
@@ -61,7 +61,7 @@
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "$PROJECT_DIR/___PACKAGENAME___"
+            argument = "&quot;$PROJECT_DIR/___PACKAGENAME___&quot;"
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
diff --git a/pkg/Templates/Apple IIgs/ORCAM Desktop Application.xctemplate/___PACKAGENAME___.xcscheme b/pkg/Templates/Apple IIgs/ORCAM Desktop Application.xctemplate/___PACKAGENAME___.xcscheme
index ef0c34f..a89e25e 100644
--- a/pkg/Templates/Apple IIgs/ORCAM Desktop Application.xctemplate/___PACKAGENAME___.xcscheme	
+++ b/pkg/Templates/Apple IIgs/ORCAM Desktop Application.xctemplate/___PACKAGENAME___.xcscheme	
@@ -61,7 +61,7 @@
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "$PROJECT_DIR/___PACKAGENAME___"
+            argument = "&quot;$PROJECT_DIR/___PACKAGENAME___&quot;"
             isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument