Changeset 4818 for trunk/src/odincrt

Timestamp:

Dec 17, 2000, 12:33:37 AM (25 years ago)

Author:

bird

Message:

Watcom preparations.

Location:

trunk/src/odincrt

Files:

• initterm.cpp (modified) (4 diffs)
• makefile (modified) (4 diffs)

trunk/src/odincrt/initterm.cpp

@@ -1 @@
-/* $Id: initterm.cpp,v 1.3 2000-02-05 02:05:37 sandervl Exp $ */
+/* $Id: initterm.cpp,v 1.4 2000-12-16 23:33:37 bird Exp $ */
 
 /*
@@ -35 +35 @@
 #include <exitlist.h>
 
+#ifdef __IBMCPP__
 extern "C" {
 /*-------------------------------------------------------------------*/
@@ -71 +72 @@
                                    ulFlag)
 {
-   size_t i;
    APIRET rc;
 
@@ -134 +134 @@
    return ;
 }
+
+#elif defined(__WATCOM_CPLUSPLUS__)
+
+/*
+ * Watcom dll init and term routines.
+ */
+
+int __dll_initialize(unsigned long hModule, unsigned long ulFlag)
+{
+    APIRET rc;
+    #if 1 /*
+          * Experimental console hack. Sets apptype to PM anyhow.
+          * First Dll to be initiated should now allways be OdinCrt!
+          * So include odincrt first!
+          */
+    PPIB pPIB;
+    PTIB pTIB;
+    rc = DosGetInfoBlocks(&pTIB, &pPIB);
+    if (rc != NO_ERROR)
+        return 0UL;
+    pPIB->pib_ultype = 3;
+    #endif
+    return 1;
+}
+
+int __dll_terminate(unsigned long hModule, unsigned long ulFlag)
+{
+    return 1;
+}
+
+#else
+#error message("compiler is not supported");
+#endif
+

trunk/src/odincrt/makefile

@@ -1 @@
-# $Id: makefile,v 1.20 2000-12-02 23:40:36 bird Exp $
+# $Id: makefile,v 1.21 2000-12-16 23:33:37 bird Exp $
 
 #
@@ -39 +39 @@
 DEFFILE = odin36$(DBG).def
 !endif
+!ifdef WAT
+DEFFILE = odinwat$(DBG).def
+!endif
 !ifndef DEFFILE
 !error "not supported on this compiler yet."
@@ -50 +53 @@
 $(OBJDIR)\odincrt.obj \
 $(OBJDIR)\initterm.obj \
+!ifndef WAT
 $(OBJDIR)\malloc.obj \
 $(OBJDIR)\string.obj \
 $(OBJDIR)\file.obj
+!else
+$(%WATCOM)\lib386\os2\$(RTLLIB_O)
+!endif
 
 
@@ -58 +65 @@
 # Libraries. One space before the '\'.
 #
-LIBS =
+LIBS = \
+!ifdef WAT
+$(RTLLIB_O)
+!endif