Apple-2-Tools
/
Apple2GSBuildPipeline
mirror of https://github.com/jeremysrand/Apple2GSBuildPipeline.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

A different take on fixing the problem with relative OBJDIR and some fixes for spaces in the path to the project

This commit is contained in:
Jeremy Rand 2020-11-26 18:05:34 -05:00
parent dd691f7802
commit 83420e3860
12 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
make/tail.mk
View File

@ -5,9 +5,6 @@
export PATH := $(PATH):$(ORCA_BIN) export PATH := $(PATH):$(ORCA_BIN)
CWD=$(shell pwd) CWD=$(shell pwd)
OBJDIR:=$(abspath $(OBJDIR))
GENDIR:=$(abspath $(GENDIR))
TARGETDIR:=$(abspath $(TARGETDIR))
DISKIMAGE=$(TARGETDIR)/$(PGM).2mg DISKIMAGE=$(TARGETDIR)/$(PGM).2mg
BUILDTARGET=$(DISKIMAGE) BUILDTARGET=$(DISKIMAGE)
@ -128,7 +125,7 @@ ifneq ($(REZ_OBJS),)
$(RM) $(TARGETDIR)/$(PGM) $(RM) $(TARGETDIR)/$(PGM)
$(CP) $(REZ_OBJS) $(TARGETDIR)/$(PGM) $(CP) $(REZ_OBJS) $(TARGETDIR)/$(PGM)
endif 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) $(CHTYP) -t $(FILETYPE) $(AUXTYPE) $(TARGETDIR)/$(PGM)
endif endif
@ -157,7 +154,7 @@ else
# resource compile will read the $(PGM).bin binary and load it into the # resource compile will read the $(PGM).bin binary and load it into the
# resources also. # resources also.
$(BINTARGET): $(BUILD_OBJS) $(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 endif
@ -187,7 +184,7 @@ $(DISKIMAGE): $(TARGETDIR)/$(PGM)
execute: $(EXECTARGET) execute: $(EXECTARGET)
executeGUI: all executeGUI: all
make/launchEmulator $(DISKIMAGE) make/launchEmulator "$(DISKIMAGE)"
executeShell: all executeShell: all
$(ORCA) $(TARGETDIR)/$(PGM) $(ORCA) $(TARGETDIR)/$(PGM)

2
pkg/Templates/Apple IIgs/Merlin Classic Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme vendored
View File

@ -61,7 +61,7 @@
isEnabled = "YES"> isEnabled = "YES">
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument
argument = "$PROJECT_DIR/___PACKAGENAME___" argument = "&quot;$PROJECT_DIR/___PACKAGENAME___&quot;""
isEnabled = "YES"> isEnabled = "YES">
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument

2
pkg/Templates/Apple IIgs/Merlin Control Panel.xctemplate/___PACKAGENAME___.xcscheme vendored
View File

@ -61,7 +61,7 @@
isEnabled = "YES"> isEnabled = "YES">
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument
argument = "$PROJECT_DIR/___PACKAGENAME___" argument = "&quot;$PROJECT_DIR/___PACKAGENAME___&quot;"
isEnabled = "YES"> isEnabled = "YES">
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument

2
pkg/Templates/Apple IIgs/Merlin Desktop Application.xctemplate/___PACKAGENAME___.xcscheme vendored
View File

@ -61,7 +61,7 @@
isEnabled = "YES"> isEnabled = "YES">
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument
argument = "$PROJECT_DIR/___PACKAGENAME___" argument = "&quot;$PROJECT_DIR/___PACKAGENAME___&quot;"
isEnabled = "YES"> isEnabled = "YES">
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument

2
pkg/Templates/Apple IIgs/Merlin New Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme vendored
View File

@ -61,7 +61,7 @@
isEnabled = "YES"> isEnabled = "YES">
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument
argument = "$PROJECT_DIR/___PACKAGENAME___" argument = "&quot;$PROJECT_DIR/___PACKAGENAME___&quot;"
isEnabled = "YES"> isEnabled = "YES">
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument

2
pkg/Templates/Apple IIgs/ORCAC Classic Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme vendored
View File

@ -61,7 +61,7 @@
isEnabled = "YES"> isEnabled = "YES">
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument
argument = "$PROJECT_DIR/___PACKAGENAME___" argument = "&quot;$PROJECT_DIR/___PACKAGENAME___&quot;"
isEnabled = "YES"> isEnabled = "YES">
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument

2
pkg/Templates/Apple IIgs/ORCAC Control Panel.xctemplate/___PACKAGENAME___.xcscheme vendored
View File

@ -61,7 +61,7 @@
isEnabled = "YES"> isEnabled = "YES">
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument
argument = "$PROJECT_DIR/___PACKAGENAME___" argument = "&quot;$PROJECT_DIR/___PACKAGENAME___&quot;"
isEnabled = "YES"> isEnabled = "YES">
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument

2
pkg/Templates/Apple IIgs/ORCAC Desktop Application.xctemplate/___PACKAGENAME___.xcscheme vendored
View File

@ -61,7 +61,7 @@
isEnabled = "YES"> isEnabled = "YES">
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument
argument = "$PROJECT_DIR/___PACKAGENAME___" argument = "&quot;$PROJECT_DIR/___PACKAGENAME___&quot;"
isEnabled = "YES"> isEnabled = "YES">
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument

2
pkg/Templates/Apple IIgs/ORCAC New Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme vendored
View File

@ -61,7 +61,7 @@
isEnabled = "YES"> isEnabled = "YES">
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument
argument = "$PROJECT_DIR/___PACKAGENAME___" argument = "&quot;$PROJECT_DIR/___PACKAGENAME___&quot;"
isEnabled = "YES"> isEnabled = "YES">
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument

2
pkg/Templates/Apple IIgs/ORCAM Classic Desk Accessory.xctemplate/___PACKAGENAME___.xcscheme vendored
View File

@ -61,7 +61,7 @@
isEnabled = "YES"> isEnabled = "YES">
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument
argument = "$PROJECT_DIR/___PACKAGENAME___" argument = "&quot;$PROJECT_DIR/___PACKAGENAME___&quot;"
isEnabled = "YES"> isEnabled = "YES">
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument

2
pkg/Templates/Apple IIgs/ORCAM Control Panel.xctemplate/___PACKAGENAME___.xcscheme vendored
View File

@ -61,7 +61,7 @@
isEnabled = "YES"> isEnabled = "YES">
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument
argument = "$PROJECT_DIR/___PACKAGENAME___" argument = "&quot;$PROJECT_DIR/___PACKAGENAME___&quot;"
isEnabled = "YES"> isEnabled = "YES">
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument

2
pkg/Templates/Apple IIgs/ORCAM Desktop Application.xctemplate/___PACKAGENAME___.xcscheme vendored
View File

@ -61,7 +61,7 @@
isEnabled = "YES"> isEnabled = "YES">
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument
argument = "$PROJECT_DIR/___PACKAGENAME___" argument = "&quot;$PROJECT_DIR/___PACKAGENAME___&quot;"
isEnabled = "YES"> isEnabled = "YES">
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument