paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-15 08:49:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

* ports needs objpas.ppu !

Browse Source
This commit is contained in:
florian 1999-12-13 23:05:12 +00:00
parent 999712c01e
commit 80cdf79bae
2 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
rtl/go32v2/Makefile
View File

@ -1,5 +1,5 @@
# #
# Makefile generated by fpcmake v0.99.13 on 1999-12-06 18:33 # Makefile generated by fpcmake v0.99.13 on 1999-12-13 23:59
# #
defaultrule: all defaultrule: all
@ -72,17 +72,12 @@ override CPU_TARGET:=i386
# What compiler to use ? # What compiler to use ?
ifndef FPC ifndef FPC
# Compatibility with old makefiles
ifdef PP
export FPC=$(PP)
else
ifdef inOS2 ifdef inOS2
export FPC=ppos2$(EXEEXT) export FPC=ppos2$(EXEEXT)
else else
export FPC=ppc386$(EXEEXT) export FPC=ppc386$(EXEEXT)
endif endif
endif endif
endif
# Target OS # Target OS
ifndef OS_TARGET ifndef OS_TARGET
@ -243,7 +238,6 @@ endif
# create fcldir,rtldir,unitdir # create fcldir,rtldir,unitdir
ifdef FPCDIR ifdef FPCDIR
override FPCDIR:=$(subst \,/,$(FPCDIR))
ifneq ($(FPCDIR),.) ifneq ($(FPCDIR),.)
override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET) override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET) override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
@ -383,15 +377,7 @@ ifdef CFGFILE
override FPCOPT+=@$(CFGFILE) override FPCOPT+=@$(CFGFILE)
endif endif
# For win32 the options are passed using the environment variable FPCEXTCMD override COMPILER=$(FPC) $(FPCOPT)
ifeq ($(OS_SOURCE),win32)
override FPCEXTCMD:=$(FPCOPT)
override FPCOPT:=!FPCEXTCMD
export FPCEXTCMD
endif
# Compiler commandline
override COMPILER:=$(FPC) $(FPCOPT)
##################################################################### #####################################################################
# Shell tools # Shell tools
@ -483,7 +469,7 @@ endif
ifeq (,$(findstring -s ,$(COMPILER))) ifeq (,$(findstring -s ,$(COMPILER)))
EXECPPAS= EXECPPAS=
else else
EXECPPAS:=@$(PPAS) EXECPPAS=@$(PPAS)
endif endif
# ldconfig to rebuild .so cache # ldconfig to rebuild .so cache
@ -719,7 +705,7 @@ override CLEANTARGET+=fpc_loaders_clean
override SHOWINSTALLTARGET+=fpc_loaders_showinstall override SHOWINSTALLTARGET+=fpc_loaders_showinstall
override INSTALLTARGET+=fpc_loaders_install override INSTALLTARGET+=fpc_loaders_install
override LOADEROFILES:=$(addsuffix $(OEXT),$(LOADEROBJECTS)) override LOADEROFILES=$(addsuffix $(OEXT),$(LOADEROBJECTS))
fpc_loaders: $(LOADEROFILES) fpc_loaders: $(LOADEROFILES)
@ -791,7 +777,7 @@ fpc_debug:
# Default sharedlib units are all unit objects # Default sharedlib units are all unit objects
ifndef SHAREDLIBUNITOBJECTS ifndef SHAREDLIBUNITOBJECTS
SHAREDLIBUNITOBJECTS:=$(UNITOBJECTS) SHAREDLIBUNITOBJECTS=$(UNITOBJECTS)
endif endif
fpc_smart: fpc_smart:
@ -821,13 +807,13 @@ endif
ifdef INSTALLPPUFILES ifdef INSTALLPPUFILES
ifdef PPUFILES ifdef PPUFILES
ifdef inlinux ifdef inlinux
INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES)) INSTALLPPULINKFILES=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES)) INSTALLPPULIBFILES=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
else else
INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES)) INSTALLPPULINKFILES=$(shell $(PPUFILES) $(INSTALLPPUFILES))
endif endif
else else
INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) INSTALLPPULINKFILES=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES))
endif endif
endif endif
@ -901,7 +887,7 @@ endif
# Test dir if none specified # Test dir if none specified
ifndef DESTZIPDIR ifndef DESTZIPDIR
DESTZIPDIR:=$(BASEDIR) DESTZIPDIR=$(BASEDIR)
endif endif
# Add .zip/.tar.gz extension # Add .zip/.tar.gz extension
@ -956,9 +942,9 @@ endif
ifdef CLEANPPUFILES ifdef CLEANPPUFILES
ifdef PPUFILES ifdef PPUFILES
CLEANPPULINKFILES:=$(shell $(PPUFILES) $(CLEANPPUFILES)) CLEANPPULINKFILES=$(shell $(PPUFILES) $(CLEANPPUFILES))
else else
CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) CLEANPPULINKFILES=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES))
endif endif
endif endif
@ -1136,4 +1122,4 @@ heaptrc$(PPUEXT) : $(INC)/heaptrc.pp $(SYSTEMPPU)
msmouse$(PPUEXT) : msmouse.pp $(SYSTEMPPU) msmouse$(PPUEXT) : msmouse.pp $(SYSTEMPPU)
ports$(PPUEXT) : ports.pp $(SYSTEMPPU) ports$(PPUEXT) : ports.pp objpas$(PPUEXT) $(SYSTEMPPU)

2
rtl/go32v2/Makefile.fpc
View File

@ -153,5 +153,5 @@ heaptrc$(PPUEXT) : $(INC)/heaptrc.pp $(SYSTEMPPU)
msmouse$(PPUEXT) : msmouse.pp $(SYSTEMPPU) msmouse$(PPUEXT) : msmouse.pp $(SYSTEMPPU)
ports$(PPUEXT) : ports.pp $(SYSTEMPPU) ports$(PPUEXT) : ports.pp objpas$(PPUEXT) $(SYSTEMPPU)