paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2026-01-05 00:12:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

* fixed go32v2,win32 build

Browse Source
This commit is contained in:
peter 2000-07-01 09:49:01 +00:00
parent 98ec034eb2
commit 78f6ad1916
7 changed files with 141 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
fcl/go32v2/Makefile
View File

@ -1,5 +1,5 @@
#
# Makefile generated by fpcmake v0.99.15 [2000/05/26]
# Makefile generated by fpcmake v0.99.15 [2000/06/03]
#
defaultrule: all
@ -205,6 +205,7 @@ endif
# Targets
override UNITOBJECTS+=classes $(INCUNITS) $(XMLUNITS) $(SHEDITUNITS)
override RSTOBJECTS+=ssockets cachecls
# Clean
@ -702,26 +703,18 @@ ifneq ($(OS_TARGET),$(OS_SOURCE))
override FPCOPT+=-T$(OS_TARGET)
endif
ifdef NEEDOPT
override FPCOPT+=$(NEEDOPT)
# User dirs should be first, so they are looked at first
ifdef UNITDIR
override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
endif
ifdef NEEDUNITDIR
override FPCOPT+=$(addprefix -Fu,$(NEEDUNITDIR))
ifdef LIBDIR
override FPCOPT+=$(addprefix -Fl,$(LIBDIR))
endif
ifdef UNITSDIR
override FPCOPT+=-Fu$(UNITSDIR)
ifdef OBJDIR
override FPCOPT+=$(addprefix -Fo,$(OBJDIR))
endif
ifdef NEEDINCDIR
override FPCOPT+=$(addprefix -Fi,$(NEEDINCDIR))
endif
# Target dirs
ifdef TARGETDIR
override FPCOPT+=-FE$(TARGETDIR)
ifdef INCDIR
override FPCOPT+=$(addprefix -Fi,$(INCDIR))
endif
# Smartlinking
@ -764,22 +757,32 @@ ifdef VERBOSE
override FPCOPT+=-vwni
endif
# Add commandline options
ifdef NEEDOPT
override FPCOPT+=$(NEEDOPT)
endif
ifdef NEEDUNITDIR
override FPCOPT+=$(addprefix -Fu,$(NEEDUNITDIR))
endif
ifdef UNITSDIR
override FPCOPT+=-Fu$(UNITSDIR)
endif
ifdef NEEDINCDIR
override FPCOPT+=$(addprefix -Fi,$(NEEDINCDIR))
endif
# Target dirs
ifdef TARGETDIR
override FPCOPT+=-FE$(TARGETDIR)
endif
# Add commandline options last so they can override
ifdef OPT
override FPCOPT+=$(OPT)
endif
ifdef UNITDIR
override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
endif
ifdef LIBDIR
override FPCOPT+=$(addprefix -Fl,$(LIBDIR))
endif
ifdef OBJDIR
override FPCOPT+=$(addprefix -Fo,$(OBJDIR))
endif
ifdef INCDIR
override FPCOPT+=$(addprefix -Fi,$(INCDIR))
endif
# Add defines from FPCOPTDEF to FPCOPT
ifdef FPCOPTDEF
@ -859,6 +862,16 @@ override CLEANPPUFILES+=$(UNITPPUFILES)
fpc_units: $(UNITPPUFILES)
#####################################################################
# Resource strings
#####################################################################
ifdef RSTOBJECTS
override RSTFILES=$(addsuffix $(RSTEXT),$(RSTOBJECTS))
override CLEANRSTFILES+=$(RSTFILES)
endif
#####################################################################
# General compile rules
#####################################################################
@ -901,6 +914,12 @@ fpc_debug:
.PHONY: fpc_smart fpc_shared
ifdef LIBVERSION
LIBFULLNAME=$(LIBNAME).$(LIBVERSION)
else
LIBFULLNAME=$(LIBNAME)
endif
# Default sharedlib units are all unit objects
ifndef SHAREDLIBUNITOBJECTS
SHAREDLIBUNITOBJECTS:=$(UNITOBJECTS)
@ -914,7 +933,7 @@ ifdef inlinux
ifndef LIBNAME
@$(ECHO) "LIBNAME not set"
else
$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBFULLNAME)
endif
else
@$(ECHO) "Shared Libraries not supported"
@ -932,14 +951,7 @@ endif
ifdef INSTALLPPUFILES
ifdef PPUFILES
ifdef inlinux
INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
ifdef LIBNAME
INSTALLPPULIBFILES=$(LIBNAME)
endif
else
INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
endif
else
INSTALLPPULINKFILES:=$(wildcard $(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)))
endif
@ -954,8 +966,11 @@ ifdef INSTALLPPUFILES
ifneq ($(INSTALLPPULINKFILES),)
@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
endif
ifneq ($(INSTALLPPULIBFILES),)
@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
ifneq ($(wildcard $(LIBFULLNAME)),)
@$(ECHO) $(LIBINSTALLDIR)/$(LIBFULLNAME)
ifdef inlinux
@$(ECHO) $(LIBINSTALLDIR)/$(LIBNAME)
endif
endif
endif
ifdef EXTRAINSTALLFILES
@ -978,9 +993,12 @@ ifdef INSTALLPPUFILES
ifneq ($(INSTALLPPULINKFILES),)
$(INSTALL) $(INSTALLPPULINKFILES) $(UNITINSTALLDIR)
endif
ifneq ($(INSTALLPPULIBFILES),)
ifneq ($(wildcard $(LIBFULLNAME)),)
$(MKDIR) $(LIBINSTALLDIR)
$(INSTALL) $(INSTALLPPULIBFILES) $(LIBINSTALLDIR)
$(INSTALL) $(LIBFULLNAME) $(LIBINSTALLDIR)
ifdef inlinux
ln -sf $(LIBFULLNAME) $(LIBINSTALLDIR)/$(LIBNAME)
endif
endif
endif
ifdef EXTRAINSTALLFILES
@ -1098,7 +1116,7 @@ ifdef EXTRACLEANFILES
-$(DEL) $(EXTRACLEANFILES)
endif
ifdef LIBNAME
-$(DEL) $(LIBNAME)
-$(DEL) $(LIBNAME) $(LIBFULLNAME)
endif
-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)

1
fcl/go32v2/Makefile.fpc
View File

@ -4,6 +4,7 @@
[targets]
units=classes $(INCUNITS) $(XMLUNITS) $(SHEDITUNITS)
rst=ssockets cachecls
[defaults]
defaulttarget=go32v2

11
fcl/inc/classes.inc
View File

@ -16,6 +16,10 @@
* Class implementations are in separate files. *
**********************************************************************}
var
ClassList : TThreadlist;
ClassAliasList : TStringList;
{
Include all message strings
@ -543,7 +547,7 @@ begin
CurFixup := TPropFixup(Items[i]);
if ((not Assigned(Root)) or (CurFixup.FInstanceRoot = Root)) and
((Length(RootName) = 0) or
(UpperCase(RootName) = UpperCase(CurFixup.FRootName))) then
(UpperCase(RootName) = UpperCase(CurFixup.FRootName))) then
begin
Delete(i);
CurFixup.Free;
@ -1194,7 +1198,10 @@ end;
{
$Log$
Revision 1.17 2000-06-29 16:29:23 sg
Revision 1.18 2000-07-01 09:49:02 peter
* fixed go32v2,win32 build
Revision 1.17 2000/06/29 16:29:23 sg
* Implemented streaming. Note: The writer driver interface is stable, but
the reader interface is not final yet!

8
fcl/linux/classes.pp
View File

@ -34,9 +34,6 @@ implementation
uses
linux;
var
ClassList : TThreadlist;
ClassAliasList : TStringList;
{ OS - independent class implementations are in /inc directory. }
{$i classes.inc}
@ -53,7 +50,10 @@ finalization
end.
{
$Log$
Revision 1.18 2000-06-29 16:32:06 sg
Revision 1.19 2000-07-01 09:49:02 peter
* fixed go32v2,win32 build
Revision 1.18 2000/06/29 16:32:06 sg
* Changes in initialisation/finalisation for streaming support
Revision 1.17 2000/06/27 17:17:34 lazarus

4
fcl/tests/testcgi.pp
View File

@ -102,8 +102,8 @@ end;
begin
try
cgiStuff := TCGIData.Create;
cgiStuff.FName := 'Michael A. Hess'; // replace with your name
cgiStuff.FEmail := 'mhess@miraclec.com';// replace with your email
cgiStuff.Name := 'Michael A. Hess'; // replace with your name
cgiStuff.Email := 'mhess@miraclec.com';// replace with your email
cgiStuff.Run;
finally
cgiStuff.Free;

106
fcl/win32/Makefile
View File

@ -1,5 +1,5 @@
#
# Makefile generated by fpcmake v0.99.15 [2000/05/26]
# Makefile generated by fpcmake v0.99.15 [2000/06/03]
#
defaultrule: all
@ -205,6 +205,7 @@ endif
# Targets
override UNITOBJECTS+=classes $(INCUNITS) $(XMLUNITS) $(SHEDITUNITS) process fileinfo
override RSTOBJECTS+=ssockets cachecls
# Clean
@ -702,26 +703,18 @@ ifneq ($(OS_TARGET),$(OS_SOURCE))
override FPCOPT+=-T$(OS_TARGET)
endif
ifdef NEEDOPT
override FPCOPT+=$(NEEDOPT)
# User dirs should be first, so they are looked at first
ifdef UNITDIR
override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
endif
ifdef NEEDUNITDIR
override FPCOPT+=$(addprefix -Fu,$(NEEDUNITDIR))
ifdef LIBDIR
override FPCOPT+=$(addprefix -Fl,$(LIBDIR))
endif
ifdef UNITSDIR
override FPCOPT+=-Fu$(UNITSDIR)
ifdef OBJDIR
override FPCOPT+=$(addprefix -Fo,$(OBJDIR))
endif
ifdef NEEDINCDIR
override FPCOPT+=$(addprefix -Fi,$(NEEDINCDIR))
endif
# Target dirs
ifdef TARGETDIR
override FPCOPT+=-FE$(TARGETDIR)
ifdef INCDIR
override FPCOPT+=$(addprefix -Fi,$(INCDIR))
endif
# Smartlinking
@ -764,22 +757,32 @@ ifdef VERBOSE
override FPCOPT+=-vwni
endif
# Add commandline options
ifdef NEEDOPT
override FPCOPT+=$(NEEDOPT)
endif
ifdef NEEDUNITDIR
override FPCOPT+=$(addprefix -Fu,$(NEEDUNITDIR))
endif
ifdef UNITSDIR
override FPCOPT+=-Fu$(UNITSDIR)
endif
ifdef NEEDINCDIR
override FPCOPT+=$(addprefix -Fi,$(NEEDINCDIR))
endif
# Target dirs
ifdef TARGETDIR
override FPCOPT+=-FE$(TARGETDIR)
endif
# Add commandline options last so they can override
ifdef OPT
override FPCOPT+=$(OPT)
endif
ifdef UNITDIR
override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
endif
ifdef LIBDIR
override FPCOPT+=$(addprefix -Fl,$(LIBDIR))
endif
ifdef OBJDIR
override FPCOPT+=$(addprefix -Fo,$(OBJDIR))
endif
ifdef INCDIR
override FPCOPT+=$(addprefix -Fi,$(INCDIR))
endif
# Add defines from FPCOPTDEF to FPCOPT
ifdef FPCOPTDEF
@ -859,6 +862,16 @@ override CLEANPPUFILES+=$(UNITPPUFILES)
fpc_units: $(UNITPPUFILES)
#####################################################################
# Resource strings
#####################################################################
ifdef RSTOBJECTS
override RSTFILES=$(addsuffix $(RSTEXT),$(RSTOBJECTS))
override CLEANRSTFILES+=$(RSTFILES)
endif
#####################################################################
# General compile rules
#####################################################################
@ -901,6 +914,12 @@ fpc_debug:
.PHONY: fpc_smart fpc_shared
ifdef LIBVERSION
LIBFULLNAME=$(LIBNAME).$(LIBVERSION)
else
LIBFULLNAME=$(LIBNAME)
endif
# Default sharedlib units are all unit objects
ifndef SHAREDLIBUNITOBJECTS
SHAREDLIBUNITOBJECTS:=$(UNITOBJECTS)
@ -914,7 +933,7 @@ ifdef inlinux
ifndef LIBNAME
@$(ECHO) "LIBNAME not set"
else
$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)
$(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBFULLNAME)
endif
else
@$(ECHO) "Shared Libraries not supported"
@ -932,14 +951,7 @@ endif
ifdef INSTALLPPUFILES
ifdef PPUFILES
ifdef inlinux
INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
ifdef LIBNAME
INSTALLPPULIBFILES=$(LIBNAME)
endif
else
INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
endif
else
INSTALLPPULINKFILES:=$(wildcard $(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)))
endif
@ -954,8 +966,11 @@ ifdef INSTALLPPUFILES
ifneq ($(INSTALLPPULINKFILES),)
@$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFILES))
endif
ifneq ($(INSTALLPPULIBFILES),)
@$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILES))
ifneq ($(wildcard $(LIBFULLNAME)),)
@$(ECHO) $(LIBINSTALLDIR)/$(LIBFULLNAME)
ifdef inlinux
@$(ECHO) $(LIBINSTALLDIR)/$(LIBNAME)
endif
endif
endif
ifdef EXTRAINSTALLFILES
@ -978,9 +993,12 @@ ifdef INSTALLPPUFILES
ifneq ($(INSTALLPPULINKFILES),)
$(INSTALL) $(INSTALLPPULINKFILES) $(UNITINSTALLDIR)
endif
ifneq ($(INSTALLPPULIBFILES),)
ifneq ($(wildcard $(LIBFULLNAME)),)
$(MKDIR) $(LIBINSTALLDIR)
$(INSTALL) $(INSTALLPPULIBFILES) $(LIBINSTALLDIR)
$(INSTALL) $(LIBFULLNAME) $(LIBINSTALLDIR)
ifdef inlinux
ln -sf $(LIBFULLNAME) $(LIBINSTALLDIR)/$(LIBNAME)
endif
endif
endif
ifdef EXTRAINSTALLFILES
@ -1098,7 +1116,7 @@ ifdef EXTRACLEANFILES
-$(DEL) $(EXTRACLEANFILES)
endif
ifdef LIBNAME
-$(DEL) $(LIBNAME)
-$(DEL) $(LIBNAME) $(LIBFULLNAME)
endif
-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)

1
fcl/win32/Makefile.fpc
View File

@ -4,6 +4,7 @@
[targets]
units=classes $(INCUNITS) $(XMLUNITS) $(SHEDITUNITS) process fileinfo
rst=ssockets cachecls
[defaults]
defaulttarget=win32