Changeset 9132 for trunk/tools/common

Timestamp:

Aug 26, 2002, 12:35:46 AM (23 years ago)

Author:

bird

Message:

Support for os2-16 (NE executables).
Corrected bad modulename for PHYSICAL DEVICE and VIRTUAL DEVICE.

Location:

trunk/tools/common

Files:

• kDef2Wat.cpp (modified) (3 diffs)
• kFileDef.cpp (modified) (3 diffs)
• kFileDef.h (modified) (1 diff)

trunk/tools/common/kDef2Wat.cpp

@@ -1 @@
-/* $Id: kDef2Wat.cpp,v 1.4 2002-05-01 03:58:36 bird Exp $
+/* $Id: kDef2Wat.cpp,v 1.5 2002-08-25 22:35:46 bird Exp $
  *
  * Converter for IBM/MS linker definition files (.DEF) to Watcom linker directives and options.
@@ -60 +60 @@
     if (!stricmp(pszOS, "os2"))
         enmOS = kFileDef::os2;
+    else if (!stricmp(pszOS, "os2-16"))
+        enmOS = kFileDef::os2v1;
     else if (!stricmp(pszOS, "dos"))
         enmOS = kFileDef::dos;
@@ -134 +136 @@
         "\n"
         "Where:\n"
-        "    <os>           Target os. os2, dos, win32, win16, nlm, qnx or elf.\n"
+        "    <os>           Target os. os2, os2-16, dos, win32, win16, nlm, qnx or elf.\n"
         "    <def-file>     The .DEF file to convert.\n"
         "    <wlink-file>   The WLINK directive and option file.\n"

trunk/tools/common/kFileDef.cpp

@@ -1 @@
-/* $Id: kFileDef.cpp,v 1.9 2002-05-01 03:58:36 bird Exp $
+/* $Id: kFileDef.cpp,v 1.10 2002-08-25 22:35:46 bird Exp $
  *
  * kFileDef - Definition files.
@@ -505 +505 @@
     if (pszStart != NULL)
     {
+        /* if phys/virt device skip second word too */
+        if (fVirtualDevice || fPhysicalDevice)
+        {
+            pszStart = strpbrk(ltrim(pszStart), " \t");
+            if (pszStart == NULL)
+                return TRUE;
+        }
+
         pszStart = ltrim(pszStart);
         pszEnd = strpbrk(pszStart, " \t");
@@ -667 +675 @@
         case kFileDef::os2:
             pOut->printf("FORMAT OS2 LX %s %s %s\n",
+                          fLibrary                               ? "DLL" :
+                            (fProgram ? (chAppType == pm         ? "PM"
+                                      : (chAppType == fullscreen ? "FULLSCREEN"
+                                                                 : "PMCOMPATIBLE"))
+                            : (fVirtualDevice                    ? "VIRTDEVICE"
+                                                                 : "PHYSDEVICE" )),
+                          fLibrary ? (fInitGlobal ? "INITGLOBAL" : "INITINSTANCE") : "",
+                          fLibrary ? (fTermGlobal ? "TERMGLOBAL" : "TERMINSTANCE") : "");
+            break;
+
+        case kFileDef::os2v1:
+            pOut->printf("FORMAT OS2 %s %s %s\n",
                           fLibrary                               ? "DLL" :
                             (fProgram ? (chAppType == pm         ? "PM"

trunk/tools/common/kFileDef.h

@@ -135 +135 @@
 
         enum {fullscreen = 0, pmvio = 2, pm = 3, unknown = 255};
-        enum {os2, dos, win32, win16, nlm, qnx, elf};
+        enum {os2, os2v1, dos, win32, win16, nlm, qnx, elf};
 };