* fixes to compile

fcl/Makefile

@@ -14,10 +14,10 @@ PP=ppc386
 
 # What is your OS ?
 # Possible choices : linux win32 go32v2 go32v1 os2
-OS_SRC=linux
+#OS_SRC=linux
 #OS_SRC=win32
 #OS_SRC=go32v1
-#OS_SRC=go32v2
+OS_SRC=go32v2
 #OS_SRC=os2
 
 # Where do you want to install the units ?
@@ -93,18 +93,15 @@ OPT:=$(OPT) -d$(CPU)
 export OS_SRC DOS SEP PP OPT REDIR COPY DEL LIBINSTALLDIR INSTALL MKDIR \
        REFPATH CPU PPUMOVE UNITINSTALLDIR
 
-.PHONY: native all linux win32 os2 go32v2 go32v1 clean install
+.PHONY: native all linux win32 os2 go32v2 clean install
 
 native: $(OS_SRC)
 
-all: linux go32v2 win32 go32v1 os2
+all: linux go32v2 win32 os2
 
 
-go32v1:
-	$(MAKE) -C dos/go32v1
-
 go32v2:
-	$(MAKE) -C dos/go32v2
+	$(MAKE) -C go32v2
 
 linux:
 	$(MAKE) -C linux
@@ -118,7 +115,7 @@ win32:
 clean:
 	$(MAKE) -C inc clean
 	$(MAKE) -C i386 clean
-	$(MAKE) -C dos/go32v2 clean
+	$(MAKE) -C go32v2 clean
 	$(MAKE) -C linux clean
 	$(MAKE) -C os2 clean
 	$(MAKE) -C win32 clean

fcl/go32v2/Makefile

@@ -0,0 +1,99 @@
+#######################################################################
+#   Makefile for Free Pascal
+#   (C) 1998 Michael van Canneyt
+#######################################################################
+#
+#  Configurable section
+#
+
+# What Compiler should we use ?
+PP=ppc386
+
+# Where are the Free Pascal units ? (Optional)
+#UNITDIR = c:/pp/units/dos/go32v2
+
+# Processor you are using
+CPU=i386
+#CPU=m68k
+
+# Any options you wish to pass to the compiler
+OPT=
+
+# Where to install the units ?
+UNITINSTALLDIR=c:/pp/units/fcl
+
+# Where to install the programs ?
+BININSTALLDIR=/pp/bin
+
+# Install program ?
+INSTALL=cp
+
+# Mkdir program ?
+MKDIR=mkdir
+
+#######################################################################
+# End of configurable section. Do not edit below this line.
+#######################################################################
+
+.SUFFIXES: .pp .ppu .pas
+.PHONY: all install clean units progs
+
+INCDIR=../inc
+CPUDIR=../$(CPU)
+
+include $(INCDIR)/Makefile.inc
+
+# Set inc
+INCFILENAMES=$(addprefix $(INCDIR)/,$(INCNAMES))
+
+# If nothing special needs doing, then just fill in the names here.
+# The rest should be automatic.
+UNITNAMES=classes
+#PROGNAMES=
+UNITOBJECTS=$(addsuffix .o, $(UNITNAMES))
+UNITFILES=$(addsuffix .ppu, $(UNITNAMES))
+PROGSOURCES=$(addsiffix .pp, $(PROGNAMES))
+PROGOBJECTS=$(addsuffix .o, $(PROGNAMES))
+
+# Adapt options. Add unit path if needed.
+override OPT:=$(OPT) -S2 -I$(INCDIR) -I$(CPUDIR)
+
+ifdef UNITDIR
+override OPT:=$(OPT) -Up$(UNITDIR)
+endif
+
+
+# Default rule for units
+.pp.ppu:
+	$(PP) $(OPT) $<
+
+# Default target.
+all: $(UNITFILES) $(PROGNAMES)
+
+units: $(UNITFILES)
+
+progs: $(PROGNAMES)
+
+# Default rule for programs
+$(PROGNAMES): %:%.pp
+	$(PP) $(OPT) $<
+
+classes.ppu: classes.pp $(INCFILENAMES) $(PROCFILENAMES)
+
+#
+# Generic install and clean targets
+#
+
+install: all
+	$(MKDIR) $(UNITINSTALLDIR)
+ifdef UNITNAMES
+	$(INSTALL) $(UNITNAMES) $(UNITINSTALLDIR)
+endif
+ifdef PROGNAMES
+	$(INSTALL) $(PROGNAMES) $(BININSTALLDIR)
+endif
+
+clean:
+	rm -f $(UNITOBJECTS) $(UNITFILES) $(PROGNAMES) $(PROGOBJECTS)
+
+# End of makefile.

fcl/go32v2/classes.pp

@@ -0,0 +1,57 @@
+{
+    $Id$
+    This file is part of the Free Component Library (FCL)
+    Copyright (c) 1998 by Michael Van Canneyt and Florian Klaempfl
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+
+{$MODE OBJFPC}
+
+{$define noexceptions}
+
+{ determine the type of the resource/form file }
+{$define Win16Res}
+unit Classes;
+
+interface
+
+uses
+  strings,
+  sysutils;
+
+{$i classesh.inc}
+
+implementation
+
+{ OS-dependent file handling. }
+{$i osfile.inc}
+
+{ OS - independent class implementations are in /inc directory. }
+{$i classes.inc}
+
+end.
+
+{
+  $Log$
+  Revision 1.1  1998-11-04 10:15:13  peter
+    * fixes to compile
+
+  Revision 1.4  1998/09/30 13:41:02  florian
+    * fixes to make it compilable
+
+  Revision 1.3  1998/05/06 13:00:25  michael
+  + Added strings to uses clause, for TStrings class.
+
+  Revision 1.2  1998/05/04 14:31:51  michael
+  + Split classes file.
+
+  Revision 1.1  1998/05/04 12:16:01  florian
+    + Initial revisions after making a new directory structure
+}

fcl/go32v2/osfile.inc

@@ -0,0 +1,92 @@
+{
+    $Id$
+    This file is part of the Free Component Library (FCL)
+    Copyright (c) 1998 by the Free Pascal development team
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+{
+
+ This file implements the system-dependent calls needed for the
+ classes unit.
+
+}
+
+Function OSCreateFile (Const Filename : string; Mode : Longint) : longint;
+{
+  Creates a file with name FileName, using mode MODE
+  --> Filename : String giving the path to the file.
+      Mode     : Mode can be
+                 fmCreate    : Create file;
+                 fmOpenRead  : open for reading;
+                 fmOpenWrite : open for writing;
+  <-- File Handle, or -1 on error.
+}
+begin
+end;
+
+Function OSReadHandle(Handle : Longint;Var Buffer; Count : Longint): Longint;
+{
+  Read from a handle
+  --> Handle : file,pipe,etc Handle to read from.
+      Buffer : Location where to put the read bytes.
+      Count  : Number of bytes that should be read
+  <-- Number of bytes actually read, or -1 on error.
+}
+
+begin
+end;
+
+Function OSWriteHandle(Handle : Longint;var Buffer; Count : longint) : Longint;
+{
+  Write to a handle
+  --> Handle : file,pipe,etc Handle to write to.
+      Buffer : Location where to get the bytes.
+      Count  : Number of bytes that should be written.
+  <-- Number of bytes actually written, or -1 on error.
+}
+begin
+end;
+
+
+Function OSSetHandleSize (Handle,Size : Longint) : longint;
+{
+  Set size of handle (for files only)
+  --> Handle : Handle to set size for.
+      Size   : Size to be set.
+  <-- 0 on success, or -1 on error.
+}
+begin
+end;
+
+Function OSSeekHandle (FHandle,OffSet,Origin : longint) : longint;
+{
+  Seek Handle position starting from Origin
+  --> Handle : Handle of file to do seek on.
+      Offset : Position to seek.
+      Origin : Where to start seek:
+               soFromBeginning
+               soFromCurrent
+               soFromEnd
+  <-- 0 on succes, -1 on error.
+}
+
+begin
+end;
+
+
+Function OSCloseHandle (Handle : longint) : longint;
+{
+  Close file associated with HAndle.
+  --> Handle : Handle of file to do seek on.
+  <-- 0 on succes, -1 on error.
+}
+
+begin
+end;

fcl/linux/classes.pp

@@ -12,6 +12,8 @@
 
  **********************************************************************}
 
+{$MODE OBJFPC}
+
 { exceptions aren't implemented yet in the compiler }
 {$define NoExceptions}
 
@@ -22,8 +24,8 @@ unit Classes;
 interface
 
 uses
-  sysutils, {!!!TSE 21.09.1998 needed for exceptions and strtoint}
+  strings,
-  strings;
+  sysutils;
 
 {$i classesh.inc}
 
@@ -33,13 +35,15 @@ implementation
 {$i osfile.inc}
 
 { OS - independent class implementations are in /inc directory. }
-
 {$i classes.inc}
 
 end.
 {
   $Log$
-  Revision 1.6  1998-10-02 09:17:57  michael
+  Revision 1.7  1998-11-04 10:15:13  peter
+    * fixes to compile
+
+  Revision 1.6  1998/10/02 09:17:57  michael
   Removed objpas from uses clause
 
   Revision 1.5  1998/09/23 07:46:57  michael