Changeset 4822 for trunk/include

Timestamp:

Dec 17, 2000, 12:41:35 AM (25 years ago)

Author:

bird

Message:

Watcom corrections.

Location:

trunk/include

Files:

• odin32.dbg.wat.mk (modified) (5 diffs)
• odin32.rel.wat.mk (modified) (4 diffs)
• win/debugtools.h (modified) (4 diffs)

trunk/include/odin32.dbg.wat.mk

@@ -1 @@
-# $Id: odin32.dbg.wat.mk,v 1.1 2000-12-02 23:50:46 bird Exp $
+# $Id: odin32.dbg.wat.mk,v 1.2 2000-12-16 23:41:35 bird Exp $
 
 #
@@ -9 +9 @@
 
 #
+# Rule attributes.
+#
+SYMBOLIC = .SYMBOLIC
+
+
+#
 # Library macros.
 #
@@ -14 +20 @@
 RTLLIB   = clib3r.lib
 RTLLIB_O = clib3r.lib
-DLLENTRY = $(ODIN32_LIB)\dllentry_watcom.obj
+DLLENTRY = $(ODIN32_LIB)\dllentry.obj
 ODINCRT  = odincrtd
 
@@ -78 +84 @@
 CXXFLAGS_WIN32APP= -w4 -wcd=726 -e25 -od -d2 -hw -bm -mf -5r -bt=os2 -zq -fp5 -fpi87
 
-CINCLUDES        = -i$(%WATCOM)\h -i$(ODIN32_INCLUDE)\Win -i. -i$(ODIN32_INCLUDE)
+CINCLUDES        = -I$(%WATCOM)\h -I$(ODIN32_INCLUDE)\Win -I. -I$(ODIN32_INCLUDE)
 CDEFINES_WIN32APP= -DDEBUG -D__WIN32OS2__ -D__i386__
 CDEFINES_ODINCRT = -DDEBUG -D__WIN32OS2__ -D__i386__ -D__WINE__
@@ -106 +112 @@
 # Linker flags.
 #
-LDFLAGS          = option maxe=125, quiet, symfile, nodefaultlibs
-LDFLAGS_ODINCRT  = option maxe=125, quiet, symfile
+LDFLAGS          = option maxe=125, quiet, symfile, nodefaultlibs  LIBPath $(%WATCOM)\lib386\os2;$(%WATCOM)\lib386
+LDFLAGS_ODINCRT  = option maxe=125, quiet, symfile  LIBPath $(%WATCOM)\lib386\os2;$(%WATCOM)\lib386
 
 !ifndef NODEBUGINFO

trunk/include/odin32.rel.wat.mk

@@ -1 @@
-# $Id: odin32.rel.wat.mk,v 1.1 2000-12-02 23:50:48 bird Exp $
+# $Id: odin32.rel.wat.mk,v 1.2 2000-12-16 23:41:35 bird Exp $
 
 #
@@ -9 +9 @@
 
 #
+# Rule attributes.
+#
+SYMBOLIC = .SYMBOLIC
+
+
+#
 # Library macros.
 #
@@ -14 +20 @@
 RTLLIB   = clib3r.lib
 RTLLIB_O = clib3r.lib
-DLLENTRY = $(ODIN32_LIB)\dllentry_watcom.obj
+DLLENTRY = $(ODIN32_LIB)\dllentry.obj
 ODINCRT  = odincrtd
 
@@ -77 +83 @@
 CFLAGS_WIN32APP  = -w4 -wcd=726 -e25 -od -bm -mf -5r -bt=os2 -zq -fp5 -fpi87
 CXXFLAGS_WIN32APP= -w4 -wcd=726 -e25 -od -bm -mf -5r -bt=os2 -zq -fp5 -fpi87
-CINCLUDES        = -i$(%WATCOM)\h -i$(ODIN32_INCLUDE)\Win -i. -i$(ODIN32_INCLUDE)
+CINCLUDES        = -I$(%WATCOM)\h -I$(ODIN32_INCLUDE)\Win -I. -I$(ODIN32_INCLUDE)
 CDEFINES         = -D__WIN32OS2__ -D__WINE__ -D__i386__ -DTCPV40HDRS -DCOMCTL32UNDOC
 CDEFINES_ODINCRT = -D__WIN32OS2__ -D__WINE__ -D__i386__

trunk/include/win/debugtools.h

@@ -17 +17 @@
   //dprintf can be called like this:
   //dprintf((LOG, "PE file           : %s", szFileName));
-  #define LOG             (void*)_privateLogFile
+  #define LOG       (void*)_privateLogFile
   #define dprintf(a)      WritePrivateLog a
   #define dprintfGlobal(a)      WriteLog a
@@ -25 +25 @@
   #define eprintf(a)      WriteLog a ; WriteLogError a
   #define dassert(a, b)   if(!(a)) WriteLogError b
-  #define dbgCheckObj(a)        a->checkObject()
+  #define dbgCheckObj(a)   a->checkObject()
   #define DisableLogging  DecreaseLogCount
   #define EnableLogging   IncreaseLogCount
@@ -213 +213 @@
       BYTE c = *src++;
       switch (c)
-        {
-        case '\n': *dst++ = '\\'; *dst++ = 'n'; break;
-        case '\r': *dst++ = '\\'; *dst++ = 'r'; break;
-        case '\t': *dst++ = '\\'; *dst++ = 't'; break;
-        case '"': *dst++ = '\\'; *dst++ = '"'; break;
-        case '\\': *dst++ = '\\'; *dst++ = '\\'; break;
-        default:
-          if (c >= ' ' && c <= 126)
-            *dst++ = c;
-          else
-            {
-              *dst++ = '\\';
-              *dst++ = '0' + ((c >> 6) & 7);
-              *dst++ = '0' + ((c >> 3) & 7);
-              *dst++ = '0' + ((c >> 0) & 7);
-            }
-        }
+   {
+   case '\n': *dst++ = '\\'; *dst++ = 'n'; break;
+   case '\r': *dst++ = '\\'; *dst++ = 'r'; break;
+   case '\t': *dst++ = '\\'; *dst++ = 't'; break;
+   case '"': *dst++ = '\\'; *dst++ = '"'; break;
+   case '\\': *dst++ = '\\'; *dst++ = '\\'; break;
+   default:
+     if (c >= ' ' && c <= 126)
+       *dst++ = c;
+     else
+       {
+         *dst++ = '\\';
+         *dst++ = '0' + ((c >> 6) & 7);
+         *dst++ = '0' + ((c >> 3) & 7);
+         *dst++ = '0' + ((c >> 0) & 7);
+       }
+   }
     }
   *dst++ = '"';
@@ -260 +260 @@
       WORD c = *src++;
       switch (c)
-        {
-        case '\n': *dst++ = '\\'; *dst++ = 'n'; break;
-        case '\r': *dst++ = '\\'; *dst++ = 'r'; break;
-        case '\t': *dst++ = '\\'; *dst++ = 't'; break;
-        case '"': *dst++ = '\\'; *dst++ = '"'; break;
-        case '\\': *dst++ = '\\'; *dst++ = '\\'; break;
-        default:
-          if (c >= ' ' && c <= 126)
-            *dst++ = c;
-          else 
-            {
-              *dst++ = '\\';
-              sprintf(dst,"%04x",c);
-              dst+=4;
-            }
-        }
+   {
+   case '\n': *dst++ = '\\'; *dst++ = 'n'; break;
+   case '\r': *dst++ = '\\'; *dst++ = 'r'; break;
+   case '\t': *dst++ = '\\'; *dst++ = 't'; break;
+   case '"': *dst++ = '\\'; *dst++ = '"'; break;
+   case '\\': *dst++ = '\\'; *dst++ = '\\'; break;
+   default:
+     if (c >= ' ' && c <= 126)
+       *dst++ = (char)c;
+     else
+       {
+         *dst++ = '\\';
+          sprintf(dst,"%04x",c);
+          dst+=4;
+       }
+   }
     }
   *dst++ = '"';