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

* callspec fixes

Browse Source
This commit is contained in:
marco 2001-01-29 12:05:25 +00:00
parent 15273e363c
commit 8f27e577c7
2 changed files with 21 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
rtl/os2/Makefile
View File

@ -1,5 +1,5 @@
# #
# Makefile generated by fpcmake v1.00 [2000/12/22] # Makefile generated by fpcmake v1.00 [2000/12/23]
# #
defaultrule: all defaultrule: all
@ -50,25 +50,6 @@ else
SRCEXEEXT=.exe SRCEXEEXT=.exe
endif endif
# The extension of batch files / scripts
ifdef inUnix
BATCHEXT=.sh
else
ifdef inOS2
BATCHEXT=.cmd
else
BATCHEXT=.bat
endif
endif
# Path Separator, the subst trick is necessary for the \ that can't exists
# at the end of a line
ifdef inUnix
PATHSEP=/
else
PATHSEP=$(subst /,\,/)
endif
# The path which is searched separated by spaces # The path which is searched separated by spaces
ifdef inUnix ifdef inUnix
SEARCHPATH=$(subst :, ,$(PATH)) SEARCHPATH=$(subst :, ,$(PATH))
@ -209,7 +190,7 @@ endif
# Targets # Targets
override LOADEROBJECTS+=prt0 prt1 code2 code3 override LOADEROBJECTS+=prt0 prt1 code2 code3
override UNITOBJECTS+=$(SYSTEMUNIT) objpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi dive dos crt objects printer sysutils math typinfo varutils ucomplex cpu mmx getopts heaptrc lineinfo dynlibs video mouse keyboard override UNITOBJECTS+=$(SYSTEMUNIT) objpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi dive dos crt objects printer sysutils math typinfo varutils ucomplex cpu mmx getopts heaptrc lineinfo dynlibs video mouse keyboard callspec
override RSTOBJECTS+=math override RSTOBJECTS+=math
# Clean # Clean
@ -350,7 +331,15 @@ LD=ld
endif endif
# ppas.bat / ppas.sh # ppas.bat / ppas.sh
PPAS=ppas$(BATCHEXT) ifdef inUnix
PPAS=ppas.sh
else
ifdef inOS2
PPAS=ppas.cmd
else
PPAS=ppas.bat
endif
endif
# ldconfig to rebuild .so cache # ldconfig to rebuild .so cache
ifdef inUnix ifdef inUnix
@ -1113,48 +1102,18 @@ USETAR=1
endif endif
endif endif
# Use a wrapper script by default for OS/2
ifdef inOS2
USEZIPWRAPPER=1
endif
# Create commands to create the zip/tar file
ZIPWRAPPER=$(DESTZIPDIR)/fpczip$(BATCHEXT)
ZIPCMD_CDPACK:=cd $(subst /,$(PATHSEP),$(PACKDIR))
ZIPCMD_CDBASE:=cd $(subst /,$(PATHSEP),$(BASEDIR))
ifdef USETAR
ZIPDESTFILE:=$(DESTZIPDIR)/$(ZIPNAME)$(TAREXT)
ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
else
ZIPDESTFILE:=$(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT)
ZIPCMD_ZIP:=$(subst /,$(PATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
endif
fpc_zipinstall: fpc_zipinstall:
ifndef ZIPNAME ifndef ZIPNAME
@$(ECHO) "Please specify ZIPNAME!" @$(ECHO) "Please specify ZIPNAME!"
@exit 1 @exit 1
else else
$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR) $(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
$(DEL) $(ZIPDESTFILE) ifdef USETAR
ifdef USEZIPWRAPPER $(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT)
ifneq ($(ECHO),echo) cd $(PACKDIR) ; $(TARPROG) cf$(TAROPT) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT) * ; cd $(BASEDIR)
$(ECHO) "$(ZIPCMD_CDPACK)" > $(ZIPWRAPPER)
$(ECHO) "$(ZIPCMD_ZIP)" >> $(ZIPWRAPPER)
$(ECHO) "$(ZIPCMD_CDBASE)" >> $(ZIPWRAPPER)
else else
$(ECHO) $(ZIPCMD_CDPACK) > $(ZIPWRAPPER) $(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT)
$(ECHO) $(ZIPCMD_ZIP) >> $(ZIPWRAPPER) cd $(PACKDIR) ; $(ZIPPROG) -Dr $(ZIPOPT) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT) * ; cd $(BASEDIR)
$(ECHO) $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)
endif
ifdef inUnix
/bin/sh $(ZIPWRAPPER)
else
$(ZIPWRAPPER)
endif
$(DEL) $(ZIPWRAPPER)
else
$(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)
endif endif
$(DELTREE) $(PACKDIR) $(DELTREE) $(PACKDIR)
endif endif
@ -1409,3 +1368,5 @@ lineinfo$(PPUEXT) : $(INC)/lineinfo.pp $(SYSTEMUNIT)$(PPUEXT)
# #
# Other system-dependent RTL Units # Other system-dependent RTL Units
# #
callspec$(PPUEXT) : $(INC)/callspec.pp $(SYSTEMUNIT)$(PPUEXT)

4
rtl/os2/Makefile.fpc
View File

@ -10,7 +10,7 @@ units=$(SYSTEMUNIT) objpas strings \
dos crt objects printer \ dos crt objects printer \
sysutils math typinfo varutils \ sysutils math typinfo varutils \
ucomplex cpu mmx getopts heaptrc lineinfo dynlibs \ ucomplex cpu mmx getopts heaptrc lineinfo dynlibs \
video mouse keyboard video mouse keyboard callspec
rst=math rst=math
[require] [require]
@ -168,3 +168,5 @@ lineinfo$(PPUEXT) : $(INC)/lineinfo.pp $(SYSTEMUNIT)$(PPUEXT)
# #
# Other system-dependent RTL Units # Other system-dependent RTL Units
# #
callspec$(PPUEXT) : $(INC)/callspec.pp $(SYSTEMUNIT)$(PPUEXT)