Changeset 1896 for trunk/src

Timestamp:

Nov 30, 1999, 8:44:05 PM (26 years ago)

Author:

sandervl

Message:

JW's updates

Location:

trunk/src/msvcrt

Files:

• makefile (modified) (3 diffs)
• msvcrt.cpp (modified) (1 diff)
• msvcrt.def (modified) (2 diffs)
• msvcrt.h (modified) (1 diff)
• msvcrt20.def (added)
• msvcrt40.def (added)

trunk/src/msvcrt/makefile

@@ -1 @@
-# $Id: makefile,v 1.4 1999-11-03 23:28:05 sandervl Exp $
+# $Id: makefile,v 1.5 1999-11-30 19:44:04 sandervl Exp $
 
 #
@@ -21 +21 @@
 
 TARGET = msvcrt
+TARGET20 = msvcrt20
+TARGET40 = msvcrt40
 
 OBJS =  msvcrt.obj initterm.obj
 
-all: $(TARGET).dll $(TARGET).lib
+all: $(TARGET).dll $(TARGET).lib $(TARGET20).dll $(TARGET20).lib \
+     $(TARGET40).dll $(TARGET40).lib
 
 
@@ -34 +37 @@
 #       $(CP) $@ $(PDWIN32_BIN)
 
+$(TARGET20).dll: $(OBJS) $(TARGET20).def
+        $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET20).def \
+              $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/kernel32.lib \
+              $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
+# Do not copy to release directory because it is not fully working yet
+#       $(CP) $@ $(PDWIN32_BIN)
+
+$(TARGET40).dll: $(OBJS) $(TARGET40).def
+        $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET40).def \
+              $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/kernel32.lib \
+              $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
+# Do not copy to release directory because it is not fully working yet
+#       $(CP) $@ $(PDWIN32_BIN)
+
 
 $(TARGET).lib: $(TARGET).def
+        $(IMPLIB) $(IMPLIBFLAGS) $@ $**
+        $(CP) $@ $(PDWIN32_LIB)
+
+$(TARGET20).lib: $(TARGET20).def
+        $(IMPLIB) $(IMPLIBFLAGS) $@ $**
+        $(CP) $@ $(PDWIN32_LIB)
+
+$(TARGET40).lib: $(TARGET40).def
         $(IMPLIB) $(IMPLIBFLAGS) $@ $**
         $(CP) $@ $(PDWIN32_LIB)

trunk/src/msvcrt/msvcrt.cpp

@@ -1 @@
-/* $Id: msvcrt.cpp,v 1.7 1999-11-30 14:17:08 sandervl Exp $ */
+/* $Id: msvcrt.cpp,v 1.8 1999-11-30 19:44:04 sandervl Exp $ */
 
 /*
- * The Visual C RunTime DLL
+ * The Visual C RunTime DLL (MSVCRT/MSVCRT20/MSVCRT40)
  * 
  * Implements Visual C run-time functionality

trunk/src/msvcrt/msvcrt.def

@@ -1 @@
-; $Id: msvcrt.def,v 1.8 1999-11-30 14:17:09 sandervl Exp $
+; $Id: msvcrt.def,v 1.9 1999-11-30 19:44:04 sandervl Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -847 +847 @@
     _mbschr                     = CRTDLL__mbschr                @345
     _mbscmp                     = CRTDLL__mbscmp                @346
-    _mbscoll                    = CRTDLL__mbscmp                @347
+    _mbscoll                    = CRTDLL__mbscmp                @347
     _mbscpy                     = CRTDLL__mbscpy                @348
     _mbscspn                    = CRTDLL__mbscspn               @349

trunk/src/msvcrt/msvcrt.h

@@ -1 @@
-/* $Id: msvcrt.h,v 1.1 1999-11-30 14:17:28 sandervl Exp $ */
+/* $Id: msvcrt.h,v 1.2 1999-11-30 19:44:04 sandervl Exp $ */
 
-/* Definitions for the MS Visual C-Runtime library (MSVCRT.DLL)
+/* Definitions for the MS Visual C-Runtime library (MSVCRT/MSVCRT20/MSVCRT40)
  *
  * Copyright 1999 Jens Wiessner