Changeset 8357 for trunk/tools

Timestamp:

Apr 30, 2002, 9:52:51 PM (23 years ago)

Author:

bird

Message:

Build environment name changes. 32-bit / 16-bit mostly.

File:

• trunk/tools/bin/buildenv.cmd (modified) (11 diffs)

trunk/tools/bin/buildenv.cmd

@@ -1 @@
-/* $Id: buildenv.cmd,v 1.5 2002-04-22 02:01:37 bird Exp $
+/* $Id: buildenv.cmd,v 1.6 2002-04-30 19:52:51 bird Exp $
  *
  * This is the master environment script. It contains settings for many
@@ -98 +98 @@
             when (sEnv.i = 'ida40') then        rc = IDA40(fRM);
             when (sEnv.i = 'idasdk') then       rc = IDASDK(fRM);
-            when (sEnv.i = 'mscv6') then        rc = MSCV6(fRM);
-            when (sEnv.i = 'msc60') then        rc = MSCV6(fRM);
+            when (sEnv.i = 'mscv6') then        rc = MSCV6_32(fRM);
+            when (sEnv.i = 'mscv6-16') then     rc = MSCV6_16(fRM);
+            when (sEnv.i = 'msc60') then        rc = MSCV6_16(fRM);
             when (sEnv.i = 'mysql') then        rc = mySQL(fRM);
             when (sEnv.i = 'netqos2') then      rc = NetQOS2(fRM);
@@ -123 +124 @@
             when (sEnv.i = 'vac40') then        rc = VAC40(fRM);
             when (sEnv.i = 'warpin') then       rc = WarpIn(fRM);
-            when (sEnv.i = 'watcomc11') then    rc = WatComC11(fRM);
-            when (sEnv.i = 'watcomc11c') then   rc = WatComC11c(fRM);
+            when (sEnv.i = 'watcomc11') then    rc = WatComC11(fRM, 32);
+            when (sEnv.i = 'watcomc11c') then   rc = WatComC11c(fRM, 32);
+            when (sEnv.i = 'watcomc11-16') then rc = WatComC11(fRM, 16);
+            when (sEnv.i = 'watcomc11c-16') then rc = WatComC11c(fRM, 16);
             when (sEnv.i = 'odin32testcase') then rc = Odin32Testcase(fRM);
 
@@ -199 +202 @@
         when (sProgram = 'idasdk') then     return 'f:\idasdk';
         when (sProgram = 'ddkbase') then    return 'f:\ddk\base';
-        when (sProgram = 'mscv6') then      return 'f:\ddktools\toolkits\msc60';
+        when (sProgram = 'mscv6-16') then   return 'f:\ddktools\toolkits\msc60';
         when (sProgram = 'mysql') then      return 'f:\mysql2';
         when (sProgram = 'netqos2') then    return 'f:\netqos2';
@@ -489 +492 @@
 
 /*
- * Microsoft C v6.0a
- */
-MSCV6: procedure
+ * Microsoft C v6.0a 16-bit
+ */
+MSCV6_16: procedure
     parse arg fRM
 
@@ -497 +500 @@
      * Microsoft C v6.0a main directory.
      */
-    sPathMSC    = QueryPath('mscv6');
-    call EnvVar_Set      fRM, 'BUILD_ENV',  'MSCV6'
+    sPathMSC    = QueryPath('mscv6-16');
+    call EnvVar_Set      fRM, 'BUILD_ENV',  'MSCV6-16'
     call EnvVar_Set      fRM, 'BUILD_PLATFORM', 'OS2'
     call EnvVar_Set      fRM, 'PATH_MSC',   sPathMSC;
@@ -505 +508 @@
     call EnvVar_AddFront fRM, 'include16',  sPathMSC'\include;'
     call EnvVar_AddFront fRM, 'lib',        sPathMSC'\lib;'
-return 0;
-
+
+return 0;
+
+
+/*
+ * Microsoft C v6.0a 32-bit
+ */
+MSCV6_32: procedure
+    parse arg fRM
+
+    /*
+     * This is where the compiler really is.
+     */
+    call DDKBase fRM;
+
+    /*
+     * Microsoft C v6.0a 32-bit main directory.
+     */
+    sPathDDKBase    = QueryPath('ddkbase');
+    call EnvVar_Set      fRM, 'BUILD_ENV',  'MSCV6'
+    call EnvVar_Set      fRM, 'BUILD_PLATFORM', 'OS2'
+    call EnvVar_Set      fRM, 'PATH_MSC',   sPathDDKBase;
+    call EnvVar_AddFront fRM, 'include',    sPathDDKBase'\h32;'
+    call EnvVar_AddFront fRM, 'lib',        sPathDDKBase'\lib;'
+return 0;
 
 
@@ -912 +938 @@
  */
 WatComC11: procedure
-    parse arg fRM
+    parse arg fRM, iBits
 
     /*
@@ -921 +947 @@
     call EnvVar_Set      fRM, 'CCENV',      'WAT'
     call EnvVar_Set      fRM, 'BUILD_ENV',  'WAT11'
+    if (iBits == 16) then
+        call EnvVar_Set      fRM, 'BUILD_ENV',  'WAT11-16'
     call EnvVar_Set      fRM, 'BUILD_PLATFORM', 'OS2'
 
@@ -942 +970 @@
  */
 WatComC11c: procedure
-    parse arg fRM
+    parse arg fRM, iBits
 
     /*
@@ -951 +979 @@
     call EnvVar_Set      fRM, 'CCENV',      'WAT'
     call EnvVar_Set      fRM, 'BUILD_ENV',  'WAT11C'
+    if (iBits = 16) then
+        call EnvVar_Set      fRM, 'BUILD_ENV',  'WAT11C-16'
     call EnvVar_Set      fRM, 'BUILD_PLATFORM', 'OS2'