Browse Source

morphos: convert the Un*x path used by the Makefile to an Amiga path before feeding it into the compiler. this fixes cycle on MorphOS again

Karoly Balogh 1 month ago
parent
commit
abbfd09233
2 changed files with 13 additions and 2 deletions
  1. 6 1
      compiler/Makefile
  2. 7 1
      compiler/Makefile.fpc

+ 6 - 1
compiler/Makefile

@@ -5326,6 +5326,11 @@ endif
 ifeq ($(COMPILEREXENAME),)
 COMPILEREXENAME:=$(EXENAME)
 endif
+ifeq ($(OS_SOURCE),morphos)
+COMPILEREXEDIR:=$(shell echo $(BASEDIR) | sed 's/\///;s/\//:/')
+else
+COMPILEREXEDIR:=$(BASEDIR)
+endif
 .PHONY : revision
 revision :
 	$(DEL) revision.inc
@@ -5346,7 +5351,7 @@ else
 endif
 	$(COMPILER) version.pas
 endif
-	$(COMPILER) -o$(BASEDIR)/$(COMPILEREXENAME) pp.pas
+	$(COMPILER) -o$(COMPILEREXEDIR)/$(COMPILEREXENAME) pp.pas
 	$(EXECPPAS)
 .PHONY: cycle full full_targets fullcycle wpocycle
 ifeq ($(CPU_SOURCE),$(PPC_TARGET))

+ 7 - 1
compiler/Makefile.fpc

@@ -905,6 +905,12 @@ ifeq ($(COMPILEREXENAME),)
 COMPILEREXENAME:=$(EXENAME)
 endif
 
+ifeq ($(OS_SOURCE),morphos)
+COMPILEREXEDIR:=$(shell echo $(BASEDIR) | sed 's/\///;s/\//:/')
+else
+COMPILEREXEDIR:=$(BASEDIR)
+endif
+
 .PHONY : revision
 
 revision :
@@ -929,7 +935,7 @@ else
 endif
         $(COMPILER) version.pas
 endif
-        $(COMPILER) -o$(BASEDIR)/$(COMPILEREXENAME) pp.pas
+        $(COMPILER) -o$(COMPILEREXEDIR)/$(COMPILEREXENAME) pp.pas
         $(EXECPPAS)
 
 #####################################################################