Changeset 9478 for trunk/src

Timestamp:

Dec 6, 2002, 4:29:45 AM (23 years ago)

Author:

bird

Message:

Used PATH_ variables first.

File:

• trunk/src/win32k/configure.cmd (modified) (5 diffs)

trunk/src/win32k/configure.cmd

@@ -1 @@
-/* $Id: configure.cmd,v 1.25 2002-08-20 05:49:51 bird Exp $
+/* $Id: configure.cmd,v 1.26 2002-12-06 03:29:45 bird Exp $
  *
  * Configuration script.
@@ -109 +109 @@
         call lineout sIncFile, '# DDKPATH: base directory of ddk base (i.e. \DDK\BASE not \DDK for DDK v4.0+).'
         call lineout sIncFile, '################################################################################'
-        sDDK = SearchPaths('INCLUDE', '..\h\dhcalls.h', 'PATH', '..\h\dhcalls.h', 'BOOKSHELF', '..\base\.\h\dhcalls.h', 'Path to DDK "\BASE" directory (i.e. F:\DDK\BASE):');
+        sDDK = SearchPaths('PATH_DDKBASE', 'h\dhcalls.h', 'INCLUDE', '..\h\dhcalls.h', 'PATH', '..\h\dhcalls.h', 'BOOKSHELF', '..\base\.\h\dhcalls.h', 'Path to DDK "\BASE" directory (i.e. F:\DDK\BASE):');
         sDDK = ValidatePath(sDDK, 'h\devhdr.h', 'DDK Base Path');
         call lineout sIncFile, 'DDKPATH          =' sDDK
@@ -117 +117 @@
         call lineout sIncFile, '# OS/2 TOOLKIT'
         call lineout sIncFile, '################################################################################'
-        sTLKT = SearchPaths('INCLUDE', '..\h\os2.h', 'PATH', '..\h\os2.h', 'BOOKSHELF', '..\h\os2.h', 'Path to OS/2 Toolkit directory:');
+        sTLKT = SearchPaths('PATH_TOOLKIT', 'h\os2.h', 'INCLUDE', '..\h\os2.h', 'PATH', '..\h\os2.h', 'BOOKSHELF', '..\h\os2.h', 'Path to OS/2 Toolkit directory:');
         sTLKT = ValidatePath(sTLKT, 'h\bsememf.h', 'OS/2 Toolkit Path');
         call lineout sIncFile, 'TOOLKIT          =' sTLKT
@@ -137 +137 @@
         call lineout sIncFile, '# Microsoft C v6.0, v6.0a or v7.0'
         call lineout sIncFile, '################################################################################'
-        sMSC = SearchPaths('PATH', '..\binp\c3l.exe', 'INCLUDE', '..\binp\c3l.exe','LIB', '..\binp\c3l.exe', 'Path to Microsoft C v6.0, v6.0a or v7.0 directory:');
+        sMSC = SearchPaths('PATH_MSC','binp\c2l.exe','PATH', '..\binp\c3l.exe', 'INCLUDE', '..\binp\c3l.exe','LIB', '..\binp\c3l.exe', 'Path to Microsoft C v6.0, v6.0a or v7.0 directory:');
         sMSC = ValidatePath(sMSC, 'binp\cl.exe', 'Microsoft C Path');
         call lineout sIncFile, 'MSCPATH          =' sMSC
@@ -301 +301 @@
     if (rc <> '') then
         return sPath;
-    say 'Warning: Validatation of the' sPath 'failed. Win32k.sys will not be built.'
+    say 'Warning: Validatation of the' sDesc 'failed. Win32k.sys will not be built.'
     say '         path='sPath;
 return '';