Changeset 8360 for trunk/tools/common/kFileDef.cpp

Timestamp:

May 1, 2002, 5:58:37 AM (23 years ago)

Author:

bird

Message:

Support for other watcom target OSes.

File:

• trunk/tools/common/kFileDef.cpp (modified) (6 diffs)

trunk/tools/common/kFileDef.cpp

@@ -1 @@
-/* $Id: kFileDef.cpp,v 1.8 2002-02-24 02:47:25 bird Exp $
+/* $Id: kFileDef.cpp,v 1.9 2002-05-01 03:58:36 bird Exp $
  *
  * kFileDef - Definition files.
@@ -644 +644 @@
  * @param   pFile   File which we're to write to (append).
  *                  Appends at current posistion.
+ * @param   enmOS   The target OS of the link operation.
  * @sketch
  * @status
@@ -649 +650 @@
  * @remark
  */
-KBOOL kFileDef::makeWatcomLinkFileAddtion(kFile *pOut)
+KBOOL kFileDef::makeWatcomLinkFileAddtion(kFile *pOut, int enmOS)
 {
     PDEFSEGMENT pSeg;
@@ -662 +663 @@
 
     /* Format - Module type */
-    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") : "");
+    switch (enmOS)
+    {
+        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::win32:
+            if (fLibrary)
+                pOut->printf("FORMAT Window NT DLL %s %s\n"
+                             "Runtime Windows\n",
+                             fLibrary ? (fInitGlobal ? "INITGLOBAL" : "INITINSTANCE") : "",
+                             fLibrary ? (fTermGlobal ? "TERMGLOBAL" : "TERMINSTANCE") : "");
+            else
+                pOut->printf("FORMAT Window NT\n"
+                             "Runtime %s\n",
+                             fProgram ? chAppType == pm  ? "Windows" : "Console" : "Native");
+            break;
+        default:
+            return FALSE;
+    }
 
 
@@ -694 +714 @@
 
     /* Protected mode */
-    if (pszProtmode)
+    if (pszProtmode && (enmOS == kFileDef::os2))
         pOut->printf("OPTION PROTMODE\n", pszProtmode);
 
@@ -743 +763 @@
         if (pExp->pszIntName)
             pOut->printf("='%s'", pExp->pszIntName);
-        if (pExp->fResident)
+        if (pExp->fResident && (enmOS == kFileDef::os2 || enmOS == kFileDef::win16))
             pOut->printf(" RESIDENT");
         if (pExp->cParam != ~0UL)