Skip to content

Commit

Permalink
Do link from the object directory and provide relative paths to the o…
Browse files Browse the repository at this point in the history
…bjects. Seems like the linker does not like the long pathnames.
  • Loading branch information
jeremysrand committed Aug 8, 2019
1 parent e5bbf48 commit bb76e8e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
7 changes: 5 additions & 2 deletions make/tail.mk
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,12 @@ ifeq ($(BINTARGET),)
# then link the binary over that same file creating the resource fork first
# and the data fork second.
$(TARGETDIR)/$(PGM): $(BUILD_OBJS)
$(MKDIR) $(TARGETDIR)
ifneq ($(REZ_OBJS),)
$(RM) $(TARGETDIR)/$(PGM)
$(CP) $(REZ_OBJS) $(TARGETDIR)/$(PGM)
endif
$(LINK) $(LDFLAGS) $(BUILD_OBJS_NOSUFFIX) --keep=$(TARGETDIR)/$(PGM)
cd $(OBJDIR); $(LINK) $(LDFLAGS) $(patsubst $(OBJDIR)/%, %, $(BUILD_OBJS_NOSUFFIX)) --keep=$(TARGETDIR)/$(PGM)
$(CHTYP) -t $(FILETYPE) $(AUXTYPE) $(TARGETDIR)/$(PGM)

endif
Expand All @@ -135,6 +136,7 @@ endif
# and the data fork second.

$(TARGETDIR)/$(PGM): $(BUILD_OBJS) $(ASM_SRCS)
$(MKDIR) $(TARGETDIR)
$(RM) $(TARGETDIR)/$(PGM)
$(MERLIN_ASM) linkscript.s $(PGM) $(TARGETDIR)/$(PGM)
ifneq ($(REZ_OBJS),)
Expand All @@ -152,7 +154,7 @@ else
# resource compile will read the $(PGM).bin binary and load it into the
# resources also.
$(BINTARGET): $(BUILD_OBJS)
$(LINK) $(LDFLAGS) $(BUILD_OBJS_NOSUFFIX) --keep=$(BINTARGET)
cd $(OBJDIR); $(LINK) $(LDFLAGS) $(patsubst $(OBJDIR)/%, %, $(BUILD_OBJS_NOSUFFIX)) --keep=$(BINTARGET)

endif

Expand All @@ -169,6 +171,7 @@ $(BINTARGET): $(BUILD_OBJS) $(ASM_SRCS)
$(REZ_OBJS): $(BINTARGET)

$(TARGETDIR)/$(PGM): $(REZ_OBJS)
$(MKDIR) $(TARGETDIR)
$(RM) $(TARGETDIR)/$(PGM)
$(CP) $(REZ_OBJS) $(TARGETDIR)/$(PGM)
$(CHTYP) -t $(FILETYPE) $(AUXTYPE) $(TARGETDIR)/$(PGM)
Expand Down
2 changes: 1 addition & 1 deletion pkg/createPackage
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ done < $PROJECTS

rm -f $PROJECTS

pkgbuild --root $TMPDIR --version 2.0.1 --identifier com.halcyontouch.Apple2gsTemplate.pkg --install-location /Library/Developer/Xcode/ --scripts pkg/scripts/ Apple2GSXcodeTemplate.pkg
pkgbuild --root $TMPDIR --version 2.0.3 --identifier com.halcyontouch.Apple2gsTemplate.pkg --install-location /Library/Developer/Xcode/ --scripts pkg/scripts/ Apple2GSXcodeTemplate.pkg
productbuild --distribution pkg/Distribution.xml --resource ./pkg temp.pkg
rm Apple2GSXcodeTemplate.pkg
productsign --sign "Developer ID Installer" temp.pkg Apple2GSXcodeTemplate.pkg
Expand Down

0 comments on commit bb76e8e

Please sign in to comment.