Browse Source

* renamed mouse->msmouse to resolve conflict with the api mouse unit

peter 26 years ago
parent
commit
b5e668300f
2 changed files with 14 additions and 39 deletions
  1. 8 5
      rtl/go32v2/Makefile
  2. 6 34
      rtl/go32v2/msmouse.pp

+ 8 - 5
rtl/go32v2/Makefile

@@ -79,8 +79,8 @@ SYSTEMPPU=system$(PPUEXT)
 OBJECTS=strings go32 initc \
 OBJECTS=strings go32 initc \
 	dpmiexcp profile dxeload emu387 \
 	dpmiexcp profile dxeload emu387 \
 	dos crt objects printer \
 	dos crt objects printer \
-        objpas sysutils typinfo math \
-	cpu mmx mouse getopts heaptrc graph
+        objpas sysutils \
+	cpu mmx msmouse getopts heaptrc graph
 
 
 LOADERS=prt0 exceptn fpu
 LOADERS=prt0 exceptn fpu
 
 
@@ -213,8 +213,8 @@ cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMPPU)
 mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMPPU)
 mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMPPU)
 	$(COMPILER) $(PROCINC)/mmx.pp $(REDIR)
 	$(COMPILER) $(PROCINC)/mmx.pp $(REDIR)
 
 
-mouse$(PPUEXT) : mouse.pp $(SYSTEMPPU)
-	$(COMPILER) mouse.pp $(REDIR)
+msmouse$(PPUEXT) : msmouse.pp $(SYSTEMPPU)
+	$(COMPILER) msmouse.pp $(REDIR)
 
 
 getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMPPU)
 getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMPPU)
 	$(COMPILER) $(INC)/getopts.pp $(REDIR)
 	$(COMPILER) $(INC)/getopts.pp $(REDIR)
@@ -260,7 +260,10 @@ include $(CFG)/makefile.def
 
 
 #
 #
 # $Log$
 # $Log$
-# Revision 1.4  1999-01-15 11:47:16  peter
+# Revision 1.5  1999-01-21 11:54:35  peter
+#   * renamed mouse->msmouse to resolve conflict with the api mouse unit
+#
+# Revision 1.4  1999/01/15 11:47:16  peter
 #   + added math unit to objects
 #   + added math unit to objects
 #
 #
 # Revision 1.3  1998/12/28 23:37:39  peter
 # Revision 1.3  1998/12/28 23:37:39  peter

+ 6 - 34
rtl/go32v2/mouse.pp → rtl/go32v2/msmouse.pp

@@ -3,6 +3,8 @@
     This file is part of the Free Pascal run time library.
     This file is part of the Free Pascal run time library.
     Copyright (c) 1993,97 by the Free Pascal development team
     Copyright (c) 1993,97 by the Free Pascal development team
 
 
+    Mouse unit for microsoft mouse compatible drivers
+
     See the file COPYING.FPC, included in this distribution,
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
     for details about the copyright.
 
 
@@ -12,7 +14,7 @@
 
 
  **********************************************************************
  **********************************************************************
 }
 }
-Unit Mouse;
+Unit MSMouse;
 Interface
 Interface
 
 
 {
 {
@@ -102,7 +104,7 @@ Var
 
 
 Implementation
 Implementation
 
 
-{$I386_ATT}
+{$asmmode ATT}
 
 
 Function InitMouse: Boolean;
 Function InitMouse: Boolean;
 begin
 begin
@@ -389,37 +391,7 @@ Begin
 End.
 End.
 {
 {
   $Log$
   $Log$
-  Revision 1.1  1998-12-21 13:07:03  peter
-    * use -FE
-
-  Revision 1.5  1998/07/15 16:10:35  jonas
-  * new mouse uni
-
-  Revision 1.3  1998/04/05 13:56:54  peter
-    - fixed mouse to compile with $i386_att
-    + linux crt supports redirecting (not Esc-codes anymore)
-
-  Revision 1.2  1998/03/26 12:25:22  peter
-    * integrated both mouse units
-
-  Revision 1.1.1.1  1998/03/25 11:18:41  root
-  * Restored version
-
-  Revision 1.4  1998/03/24 15:53:12  peter
-    * cleanup and doesn't give warnings when compiling
-
-  Revision 1.3  1998/01/26 11:56:24  michael
-  + Added log at the end
-
-  Revision 1.2
-  date: 1997/12/01 12:15:45;  author: michael;  state: Exp;  lines: +14 -12
-  + added copyright reference in header.
-
-  Revision 1.1
-  date: 1997/11/27 08:33:49;  author: michael;  state: Exp;
-  Initial revision
+  Revision 1.1  1999-01-21 11:54:37  peter
+    * renamed mouse->msmouse to resolve conflict with the api mouse unit
 
 
-  Revision 1.1.1.1
-  date: 1997/11/27 08:33:49;  author: michael;  state: Exp;  lines: +0 -0
-  FPC RTL CVS start
 }
 }