Bladeren bron

* install Package.fpc

peter 24 jaren geleden
bovenliggende
commit
36e340cbeb
2 gewijzigde bestanden met toevoegingen van 34 en 3 verwijderingen
  1. 4 1
      Makefile.fpc
  2. 30 2
      ide/Makefile

+ 4 - 1
Makefile.fpc

@@ -104,9 +104,12 @@ endif
 # Temporary path to pack a file
 BASEPACKDIR=$(BASEDIR)/basepack
 
+# Newly created fpcmake
+FPCMAKENEW=$(BASEDIR)/utils/fpcm/fpcmake$(EXEEXT)
+
 # Build/install options
 BUILDOPTS=FPC=$(PPNEW) RELEASE=1
-INSTALLOPTS=FPC=$(PPNEW) ZIPDESTDIR=$(BASEDIR)
+INSTALLOPTS=FPC=$(PPNEW) ZIPDESTDIR=$(BASEDIR) FPCMAKE=$(FPCMAKENEW)
 
 # Compile also IDE (check for ide and fv dir)
 ifneq ($(wildcard ide),)

+ 30 - 2
ide/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/07/13]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/07/31]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -68,9 +68,18 @@ ifndef FPC
 ifdef PP
 FPC=$(PP)
 else
+ifdef inUnix
+CPU_SOURCE=$(shell uname -m)
+ifeq (m68k,$(CPU_SOURCE))
+FPC=ppc68k
+else
+FPC=ppc386
+endif
+else
 FPC=ppc386
 endif
 endif
+endif
 override FPC:=$(subst $(SRCEXEEXT),,$(FPC))
 override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)
 ifndef OS_TARGET
@@ -379,6 +388,25 @@ SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
 endif
+ifeq ($(OS_TARGET),amiga)
+EXEEXT=
+PPUEXT=.ppa
+ASMEXT=.asm
+OEXT=.o
+SMARTEXT=.sl
+STATICLIBEXT=.a
+SHAREDLIBEXT=.library
+FPCMADE=fpcmade.amg
+endif
+ifeq ($(OS_TARGET),atari)
+PPUEXT=.ppt
+ASMEXT=.s
+OEXT=.o
+SMARTEXT=.sl
+STATICLIBEXT=.a
+EXEEXT=.ttp
+FPCMADE=fpcmade.ata
+endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -710,7 +738,7 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 fpc_distclean: clean
 ifdef COMPILER_UNITTARGETDIR
 TARGETDIRCLEAN=fpc_clean