Browse Source

* API fix for Go32v2

marco 24 years ago
parent
commit
15273e363c
2 changed files with 21 additions and 58 deletions
  1. 18 57
      rtl/go32v2/Makefile
  2. 3 1
      rtl/go32v2/Makefile.fpc

+ 18 - 57
rtl/go32v2/Makefile

@@ -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))
@@ -213,7 +194,7 @@ endif
 # Targets
 # Targets
 
 
 override LOADEROBJECTS+=prt0 exceptn fpu
 override LOADEROBJECTS+=prt0 exceptn fpu
-override UNITOBJECTS+=system objpas strings go32 dpmiexcp initc ports profile dxeload emu387 dos crt objects printer graph sysutils math typinfo cpu mmx getopts heaptrc lineinfo msmouse charset varutils video mouse keyboard vesamode
+override UNITOBJECTS+=system objpas strings go32 dpmiexcp initc ports profile dxeload emu387 dos crt objects printer graph sysutils math typinfo cpu mmx getopts heaptrc lineinfo msmouse charset varutils video mouse keyboard vesamode callspec
 override RSTOBJECTS+=math varutils
 override RSTOBJECTS+=math varutils
 
 
 # Clean
 # Clean
@@ -354,7 +335,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
@@ -1117,48 +1106,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 USEZIPWRAPPER
-ifneq ($(ECHO),echo)
-	$(ECHO) "$(ZIPCMD_CDPACK)" > $(ZIPWRAPPER)
-	$(ECHO) "$(ZIPCMD_ZIP)" >> $(ZIPWRAPPER)
-	$(ECHO) "$(ZIPCMD_CDBASE)" >> $(ZIPWRAPPER)
-else
-	$(ECHO) $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)
-	$(ECHO) $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)
-	$(ECHO) $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)
-endif
-ifdef inUnix
-	/bin/sh $(ZIPWRAPPER)
-else
-	$(ZIPWRAPPER)
-endif
-	$(DEL) $(ZIPWRAPPER)
+ifdef USETAR
+	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT)
+	cd $(PACKDIR) ; $(TARPROG) cf$(TAROPT) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT) * ; cd $(BASEDIR)
 else
 else
-	$(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)
+	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT)
+	cd $(PACKDIR) ; $(ZIPPROG) -Dr $(ZIPOPT) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT) * ; cd $(BASEDIR)
 endif
 endif
 	$(DELTREE) $(PACKDIR)
 	$(DELTREE) $(PACKDIR)
 endif
 endif
@@ -1416,3 +1375,5 @@ charset$(PPUEXT) : $(INC)/charset.pp system$(PPUEXT)
 #
 #
 
 
 msmouse$(PPUEXT) : msmouse.pp system$(PPUEXT)
 msmouse$(PPUEXT) : msmouse.pp system$(PPUEXT)
+
+callspec$(PPUEXT) : $(INC)/callspec.pp system$(PPUEXT)

+ 3 - 1
rtl/go32v2/Makefile.fpc

@@ -10,7 +10,7 @@ units=system objpas strings \
       sysutils math typinfo \
       sysutils math typinfo \
       cpu mmx getopts heaptrc lineinfo \
       cpu mmx getopts heaptrc lineinfo \
       msmouse charset varutils \
       msmouse charset varutils \
-      video mouse keyboard vesamode
+      video mouse keyboard vesamode callspec
       
       
 rst=math varutils
 rst=math varutils
 
 
@@ -176,3 +176,5 @@ charset$(PPUEXT) : $(INC)/charset.pp system$(PPUEXT)
 #
 #
 
 
 msmouse$(PPUEXT) : msmouse.pp system$(PPUEXT)
 msmouse$(PPUEXT) : msmouse.pp system$(PPUEXT)
+
+callspec$(PPUEXT) : $(INC)/callspec.pp system$(PPUEXT)