Changeset 5317 for trunk/tools

Timestamp:

Mar 14, 2001, 9:17:52 PM (24 years ago)

Author:

bird

Message:

Addjustments of supertarget and NT version.

File:

• trunk/tools/fastdep/fastdep.c (modified) (13 diffs)

trunk/tools/fastdep/fastdep.c

@@ -1 @@
-/* $Id: fastdep.c,v 1.25 2001-03-02 11:23:24 phaller Exp $
+/* $Id: fastdep.c,v 1.26 2001-03-14 20:17:52 bird Exp $
  *
  * Fast dependents. (Fast = Quick and Dirty!)
  *
- * Copyright (c) 1999-2000 knut st. osmundsen
+ * Copyright (c) 1999-2001 knut st. osmundsen
  *
  * PH 2001-03-01 added optional support for a super-dependency
@@ -17 +17 @@
 #define INCL_FILEMGR
 
+/*
+ * Size of the \n charater (forget '\r').
+ * If you're compiling this under a UNICODE system this may perhaps change,
+ * but I doubd that fastdep will work at all under a UNICODE system. ;-)
+ */                        
+#if defined(UNICODE) && !defined(__WIN32OS2__)
+#define CBNEWLINE     (2)
+#else
+#define CBNEWLINE     (1)
+#endif
+
+
 
 /*******************************************************************************
 *   Header Files                                                               *
 *******************************************************************************/
+#if defined(OS2FAKE)
+#include "os2fake.h"
+#else
 #include <os2.h>
+#endif
+
 #include <stdio.h>
 #include <string.h>
@@ -726 +743 @@
             int             i;
 
+
             /*
              * If append option is specified we'll have to read the existing dep file
@@ -817 +835 @@
 {
     printf(
-        "FastDep v0.31\n"
+        "FastDep v0.32\n"
         "Dependency scanner. Creates a makefile readable depend file.\n"
         " - was quick and dirty, now it's just quick -\n"
@@ -850 +868 @@
         "                   -obr-: No object rule, rule for source filename is generated.\n"
         "   -obj[ ]<objext> Object extention.           Default: obj\n"
-        "   -s <name>       Insert super-dependency on top of tree, Default: alltargets:\n"
+        "   -s[ ][name]     Insert super-dependency on top of tree.\n"
+        "                   If not specified name defaults to 'alltargets'.\n"
+        "                   Default: disabled\n"
         "   -r[ ]<rsrcext>  Resource binary extention.  Default: res\n"
         "   -x[ ]<f1[;f2]>  Files to exclude. Only exact filenames.\n"
@@ -856 +876 @@
         "\n"
         "Options and files could be mixed.\n"
-        " copyright (c) 1999-2000 knut st. osmundsen (knut.stange.osmundsen@pmsc.no)\n",
+        " copyright (c) 1999-2001 knut st. osmundsen (knut.stange.osmundsen@mynd.no)\n",
         pszDefaultDepFile
         );
@@ -2577 +2597 @@
         int         cch;
 
-        /* PH Note: might not be CRLF on other platforms */
-        int iCRLF = strlen("\n");
-
-
         /* @@@PH 2001-03-01
          * If option is selected to generate a parent
@@ -2612 +2628 @@
 
             /* Add two new lines. Flush buffer first if necessary. */
-            if (iBuffer + iCRLF + iCRLF >= sizeof(szBuffer))
+            if (iBuffer + CBNEWLINE*2 >= sizeof(szBuffer))
             {
                 fwrite(szBuffer, iBuffer, 1, phFile);
@@ -2620 +2636 @@
             /* add 2 linefeeds */
             strcpy(szBuffer + iBuffer, "\n\n");
-            iBuffer += iCRLF + iCRLF;
+            iBuffer += CBNEWLINE*2;
         }
 
@@ -2659 +2675 @@
 
             /* Add two new lines. Flush buffer first if necessary. */
-            if (iBuffer + iCRLF + iCRLF >= sizeof(szBuffer))
+            if (iBuffer + CBNEWLINE*2 >= sizeof(szBuffer))
             {
                 fwrite(szBuffer, iBuffer, 1, phFile);
@@ -2667 +2683 @@
             /* add 2 linefeeds */
             strcpy(szBuffer + iBuffer, "\n\n");
-            iBuffer += iCRLF + iCRLF;
+            iBuffer += CBNEWLINE*2;
 
             /* next rule */
@@ -2879 +2895 @@
 
 
+
+
 /*
  * Testing purpose.
  */
+#if !defined(OS2FAKE)
 #include <os2.h>
+#endif
 #ifdef OLEMANN
 #include "olemann.h"
@@ -2889 +2909 @@
 
 
+