[dreimer] 40551: Add Colin's changes to the PC Files, too. Out of consistency I renamed the variables to _ROSBE_xxxxx instead of ROSBE_xxxxx. Next: Regain compatibility to current and older revs which is lost due to this rename. My Idea would be to clone the vars into the old TARGET_CPPFLAGS etcetc on demand by a special command paramater for build or RosBE itself. Btw I still don't get why we renamed them. Why not just keep the current name??!

Author: dreimer
Date: Fri Apr 17 03:57:15 2009
New Revision: 40551

URL: http://svn.reactos.org/svn/reactos?rev=40551&view=rev
Log:
Add Colin's changes to the PC Files, too.
Out of consistency I renamed the variables to _ROSBE_xxxxx instead of ROSBE_xxxxx.
Next: Regain compatibility to current and older revs which is lost due to this rename. My
Idea would be to clone the vars into the old TARGET_CPPFLAGS etcetc on demand by a special
command paramater for build or RosBE itself. Btw I still don't get why we renamed
them. Why not just keep the current name??!

Modified:
    trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1
    trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Fri Apr 17
03:57:15 2009
@@ -86,18 +86,18 @@
 if ($_ROSBE_MODE -eq "MinGW") {
     $ENV:C_INCLUDE_PATH =
"$_ROSBE_HOST_MINGWPATH\include;$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include"
     $ENV:CPLUS_INCLUDE_PATH =
"$_ROSBE_HOST_MINGWPATH\include;$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_GCCVERSION;$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_GCCVERSION\$_ROSBE_GCCTARGET;$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include"
-    $ENV:HOST_CFLAGS = $null
-    $ENV:HOST_CPPFLAGS = $null
-    $ENV:TARGET_CFLAGS = $null
-    $ENV:TARGET_CPPFLAGS = $null
+    $ENV:_ROSBE_HOST_CFLAGS = $null
+    $ENV:_ROSBE_HOST_CXXFLAGS = $null
+    $ENV:_ROSBE_TARGET_CFLAGS = $null
+    $ENV:_ROSBE_TARGET_CXXFLAGS = $null
 
 } else {
     $ENV:C_INCLUDE_PATH = $null
     $ENV:CPLUS_INCLUDE_PATH = $null
-    $ENV:HOST_CFLAGS = "-I""$_ROSBE_HOST_MINGWPATH\include""
-I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include"""
-    $ENV:HOST_CPPFLAGS = "-I""$_ROSBE_HOST_MINGWPATH\include""
-I""$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_HOST_GCCVERSION""
-I""$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_HOST_GCCVERSION\$_ROSBE_HOST_GCCTARGET""
-I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include"""
-    $ENV:TARGET_CFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\include""
-I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include"""
-    $ENV:TARGET_CPPFLAGS =
"-I""$_ROSBE_TARGET_MINGWPATH\include""
-I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_GCCVERSION""
-I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_GCCVERSION\$_ROSBE_GCCTARGET""
-I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include"""
+    $ENV:_ROSBE_HOST_CFLAGS =
"-I""$_ROSBE_HOST_MINGWPATH\include""
-I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include"""
+    $ENV:_ROSBE_HOST_CXXFLAGS =
"-I""$_ROSBE_HOST_MINGWPATH\include""
-I""$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_HOST_GCCVERSION""
-I""$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_HOST_GCCVERSION\$_ROSBE_HOST_GCCTARGET""
-I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include"""
+    $ENV:_ROSBE_TARGET_CFLAGS =
"-I""$_ROSBE_TARGET_MINGWPATH\include""
-I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include"""
+    $ENV:_ROSBE_TARGET_CXXFLAGS =
"-I""$_ROSBE_TARGET_MINGWPATH\include""
-I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_GCCVERSION""
-I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_GCCVERSION\$_ROSBE_GCCTARGET""
-I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include"""
 }
 if ($_ROSBE_HOST_GCCVERSION -eq "3.4.5") {
     $ENV:PATH =
"$_ROSBE_BASEDIR\3.4.5\bin;$_ROSBE_BASEDIR\3.4.5\libexec\gcc\mingw32\3.4.5;$ENV:PATH"
@@ -106,8 +106,8 @@
     $ENV:C_INCLUDE_PATH =
"$_ROSBE_BASEDIR\3.4.5\include;$_ROSBE_BASEDIR\3.4.5\lib\gcc\mingw32\3.4.5\include"
     $ENV:CPLUS_INCLUDE_PATH =
"$_ROSBE_BASEDIR\3.4.5\include;$_ROSBE_BASEDIR\3.4.5\include\c++\3.4.5;$_ROSBE_BASEDIR\3.4.5\include\c++\3.4.5\mingw32;$_ROSBE_BASEDIR\3.4.5\lib\gcc\mingw32\3.4.5\include"
     $ENV:LIBRARY_PATH =
"$_ROSBE_BASEDIR\3.4.5\lib;$_ROSBE_BASEDIR\3.4.5\lib\gcc\mingw32\3.4.5"
-    $ENV:HOST_CFLAGS = $null
-    $ENV:HOST_CPPFLAGS = $null
-    $ENV:TARGET_CFLAGS = $null
-    $ENV:TARGET_CPPFLAGS = $null
+    $ENV:_ROSBE_HOST_CFLAGS = $null
+    $ENV:_ROSBE_HOST_CXXFLAGS = $null
+    $ENV:_ROSBE_TARGET_CFLAGS = $null
+    $ENV:_ROSBE_TARGET_CXXFLAGS = $null
 }

Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Fri Apr 17
03:57:15 2009
@@ -99,18 +99,18 @@
 if "%_ROSBE_MODE%" == "MinGW" (
     set
C_INCLUDE_PATH=%_ROSBE_HOST_MINGWPATH%\include;%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include
     set
CPLUS_INCLUDE_PATH=%_ROSBE_HOST_MINGWPATH%\include;%_ROSBE_HOST_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%;%_ROSBE_HOST_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\%_ROSBE_GCCTARGET%;%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include
-    set ROSBE_HOST_CFLAGS=
-    set ROSBE_HOST_CXXFLAGS=
-    set ROSBE_TARGET_CFLAGS=
-    set ROSBE_TARGET_CXXFLAGS=
+    set _ROSBE_HOST_CFLAGS=
+    set _ROSBE_HOST_CXXFLAGS=
+    set _ROSBE_TARGET_CFLAGS=
+    set _ROSBE_TARGET_CXXFLAGS=
 
 ) else (
     set C_INCLUDE_PATH=
     set CPLUS_INCLUDE_PATH=
-    set ROSBE_HOST_CFLAGS=-I"%_ROSBE_HOST_MINGWPATH%\include"
-I"%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_HOST_GCCTARGET%\%_ROSBE_HOST_GCCVERSION%\include"
-    set ROSBE_HOST_CXXFLAGS=-I"%_ROSBE_HOST_MINGWPATH%\include"
-I"%_ROSBE_HOST_MINGWPATH%\include\c++\%_ROSBE_HOST_GCCVERSION%"
-I"%_ROSBE_HOST_MINGWPATH%\include\c++\%_ROSBE_HOST_GCCVERSION%\%_ROSBE_HOST_GCCTARGET%"
-I"%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_HOST_GCCTARGET%\%_ROSBE_HOST_GCCVERSION%\include"
-    set ROSBE_TARGET_CFLAGS=-I"%_ROSBE_TARGET_MINGWPATH%\include"
-I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include"
-    set ROSBE_TARGET_CXXFLAGS=-I"%_ROSBE_TARGET_MINGWPATH%\include"
-I"%_ROSBE_TARGET_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%"
-I"%_ROSBE_TARGET_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\%_ROSBE_GCCTARGET%"
-I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include"
+    set _ROSBE_HOST_CFLAGS=-I"%_ROSBE_HOST_MINGWPATH%\include"
-I"%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_HOST_GCCTARGET%\%_ROSBE_HOST_GCCVERSION%\include"
+    set _ROSBE_HOST_CXXFLAGS=-I"%_ROSBE_HOST_MINGWPATH%\include"
-I"%_ROSBE_HOST_MINGWPATH%\include\c++\%_ROSBE_HOST_GCCVERSION%"
-I"%_ROSBE_HOST_MINGWPATH%\include\c++\%_ROSBE_HOST_GCCVERSION%\%_ROSBE_HOST_GCCTARGET%"
-I"%_ROSBE_HOST_MINGWPATH%\lib\gcc\%_ROSBE_HOST_GCCTARGET%\%_ROSBE_HOST_GCCVERSION%\include"
+    set _ROSBE_TARGET_CFLAGS=-I"%_ROSBE_TARGET_MINGWPATH%\include"
-I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include"
+    set _ROSBE_TARGET_CXXFLAGS=-I"%_ROSBE_TARGET_MINGWPATH%\include"
-I"%_ROSBE_TARGET_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%"
-I"%_ROSBE_TARGET_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\%_ROSBE_GCCTARGET%"
-I"%_ROSBE_TARGET_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include"
 )
 if "%_ROSBE_HOST_GCCVERSION%" == "3.4.5" (
     set
PATH=%_ROSBE_BASEDIR%\3.4.5\bin;%_ROSBE_BASEDIR%\3.4.5\libexec\gcc\mingw32\3.4.5;%PATH%
@@ -119,8 +119,8 @@
     set
C_INCLUDE_PATH=%_ROSBE_BASEDIR%\3.4.5\include;%_ROSBE_BASEDIR%\3.4.5\lib\gcc\mingw32\3.4.5\include
     set
CPLUS_INCLUDE_PATH=%_ROSBE_BASEDIR%\3.4.5\include;%_ROSBE_BASEDIR%\3.4.5\include\c++\3.4.5;%_ROSBE_BASEDIR%\3.4.5\include\c++\3.4.5\mingw32;%_ROSBE_BASEDIR%\3.4.5\lib\gcc\mingw32\3.4.5\include
     set
LIBRARY_PATH=%_ROSBE_BASEDIR%\3.4.5\lib;%_ROSBE_BASEDIR%\3.4.5\lib\gcc\mingw32\3.4.5
-    set ROSBE_HOST_CFLAGS=
-    set ROSBE_HOST_CXXFLAGS=
-    set ROSBE_TARGET_CFLAGS=
-    set ROSBE_TARGET_CXXFLAGS=
+    set _ROSBE_HOST_CFLAGS=
+    set _ROSBE_HOST_CXXFLAGS=
+    set _ROSBE_TARGET_CFLAGS=
+    set _ROSBE_TARGET_CXXFLAGS=
 )