Changeset 9695 for trunk/tools

Timestamp:

Jan 20, 2003, 11:15:58 PM (23 years ago)

Author:

bird

Message:

Added new gcc 3.x setup.

File:

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

trunk/tools/bin/buildenv.cmd

@@ -1 @@
-/* $Id: buildenv.cmd,v 1.40 2002-12-18 16:45:19 bird Exp $
+/* $Id: buildenv.cmd,v 1.41 2003-01-20 22:15:58 bird Exp $
  *
  * This is the master tools environment script. It contains environment
@@ -27 +27 @@
      * Version
      */
-    sVersion = '1.0.12 [2002-12-18]';
+    sVersion = '1.0.14 [2003-01-20]';
 
     /*
@@ -839 +839 @@
         aPath.i.sPId = 'freetypeemx';               aPath.i.sPath = 'f:\Freetype\v1.3.1-emx\emx';   i = i + 1;
         aPath.i.sPId = 'gcc302';                    aPath.i.sPath = 'f:\gcc302beta';                i = i + 1;
-        aPath.i.sPId = 'gcc303';                    aPath.i.sPath = 'f:\gcc303beta';                i = i + 1;
+        aPath.i.sPId = 'gcc303';                    aPath.i.sPath = 'f:\gcc\v3.0.3beta\emx';        i = i + 1;
         aPath.i.sPId = 'icatgam';                   aPath.i.sPath = 'f:\icatos2';                   i = i + 1;
         aPath.i.sPId = 'icatgam406rc1';             aPath.i.sPath = 'f:\icatos2.4.0.6.rc1';         i = i + 1;
@@ -1997 +1997 @@
 
     call EnvAddFront fRM, 'BEGINLIBPATH',       sGCCBack'\dll;'
-    call EnvAddFront fRM, 'PATH',               sGCCBack'\bin;'
+    call EnvAddFront fRM, 'PATH',               sGCCBack'\bin.new;'sGCCBack'\bin;'
     call EnvAddFront fRM, 'DPATH',              sGCCBack'\book;'
     call EnvAddFront fRM, 'BOOKSHELF',          sGCCBack'\book;'
@@ -2013 +2013 @@
      * Verify.
      */
-    if (pos('verify', sOperation) <= 0) then
-        return 0;
-    if (    \CfgVerifyFile(sGCCBack'\bin\gcc.exe', fQuiet),
-        |   \CfgVerifyFile(sGCCBack'\bin\g++.exe', fQuiet),
-        |   \CfgVerifyFile(sGCCBack'\bin\as.exe', fQuiet),
-        |   \CfgVerifyFile(sGCCBack'\bin\readelf.exe', fQuiet),
-        |   \CfgVerifyFile(sGCCBack'\bin\emxomf.exe', fQuiet),
+    ch = right(sToolId, 1);
+    if (pos('verify', sOperation) <= 0) then
+        return 0;
+    if (    \CfgVerifyFile(sGCCBack'\bin.new\gcc.exe', fQuiet),
+        |   \CfgVerifyFile(sGCCBack'\bin.new\g++.exe', fQuiet),
+        |   \CfgVerifyFile(sGCCBack'\bin.new\as.exe', fQuiet),
+        |   \CfgVerifyFile(sGCCBack'\bin.new\readelf.exe', fQuiet),
+        |   \CfgVerifyFile(sGCCBack'\bin.new\emxomf.exe', fQuiet),
         |   \CfgVerifyFile(sGCCBack'\dll\bfd211.dll', fQuiet),
         |   \CfgVerifyFile(sGCCBack'\lib\iberty.a', fQuiet),
@@ -2029 +2030 @@
         |   \CfgVerifyFile(sGCCBack'\lib\opcodes_s.a', fQuiet),
         |   \CfgVerifyFile(sGCCBack'\lib\opcodes_s.lib', fQuiet),
+        |   \CfgVerifyFile(sGCCBack'\lib\gcc-lib\i386-pc-os2_emx\3.0.'ch'\st\gcc_dll.lib', fQuiet),
+        |   \CfgVerifyFile(sGCCBack'\lib\gcc-lib\i386-pc-os2_emx\3.0.'ch'\st\stdcxx.lib', fQuiet),
         ) then
         return 2;