mirror of
https://github.com/reactos/RosBE.git
synced 2024-11-23 11:29:44 +00:00
Hopefully a REAL FIX for our new setlocal eats up vars problem
svn path=/trunk/tools/RosBE/; revision=955
This commit is contained in:
parent
6e99f9f44d
commit
cab45f5c69
@ -33,52 +33,13 @@ if "%1" == "chdefgcc" (
|
||||
goto :main
|
||||
)
|
||||
|
||||
setlocal enabledelayedexpansion
|
||||
|
||||
set _ROSBE_OBJPATH=%_ROSBE_i386_OBJPATH%
|
||||
set _ROSBE_OUTPATH=%_ROSBE_i386_OUTPATH%
|
||||
|
||||
if not "!_ROSBE_ARCH!" == "" (
|
||||
set ROS_ARCH=!_ROSBE_ARCH!
|
||||
set ROS_PREFIX=!_ROSBE_ARCH!-pc-mingw32
|
||||
set _ROSBE_TARGET_MINGWPATH=!_ROSBE_BASEDIR!\!_ROSBE_ARCH!
|
||||
|
||||
REM HAXX
|
||||
|
||||
if "!_ROSBE_ARCH!" == "arm" (
|
||||
set _ROSBE_OBJPATH=!_ROSBE_ARM_OBJPATH!
|
||||
set _ROSBE_OUTPATH=!_ROSBE_ARM_OUTPATH!
|
||||
)
|
||||
if "!_ROSBE_ARCH!" == "ppc" (
|
||||
set _ROSBE_OBJPATH=!_ROSBE_PPC_OBJPATH!
|
||||
set _ROSBE_OUTPATH=!_ROSBE_PPC_OUTPATH!
|
||||
)
|
||||
if "!_ROSBE_ARCH!" == "amd64" (
|
||||
set _ROSBE_OBJPATH=!_ROSBE_AMD64_OBJPATH!
|
||||
set _ROSBE_OUTPATH=!_ROSBE_AMD64_OUTPATH!
|
||||
set ROS_PREFIX=x86_64-pc-mingw32
|
||||
set _ROSBE_TARGET_MINGWPATH=!_ROSBE_BASEDIR!\x86_64
|
||||
)
|
||||
|
||||
REM Check if existant arch
|
||||
|
||||
if not exist "!_ROSBE_TARGET_MINGWPATH!\." (
|
||||
echo Unsupported arch specified. Fallback to Default.
|
||||
pause
|
||||
set _ROSBE_OBJPATH=!_ROSBE_i386_OBJPATH!
|
||||
set _ROSBE_OUTPATH=!_ROSBE_i386_OUTPATH!
|
||||
set ROS_ARCH=
|
||||
set ROS_PREFIX=
|
||||
set _ROSBE_TARGET_MINGWPATH=
|
||||
)
|
||||
)
|
||||
|
||||
"%_ROSBE_BASEDIR%\setlocal.cmd"
|
||||
::
|
||||
:: Set up the GCC 4.x.x build environment.
|
||||
::
|
||||
|
||||
endlocal
|
||||
|
||||
:main
|
||||
|
||||
set PATH=%_ROSBE_HOST_MINGWPATH%\bin;%_ROSBE_TARGET_MINGWPATH%\bin;%_ROSBE_ORIGINALPATH%
|
||||
|
49
RosBE-Windows/Root/setlocal.cmd
Normal file
49
RosBE-Windows/Root/setlocal.cmd
Normal file
@ -0,0 +1,49 @@
|
||||
::
|
||||
:: PROJECT: RosBE - ReactOS Build Environment for Windows
|
||||
:: LICENSE: GNU General Public License v2. (see LICENSE.txt)
|
||||
:: FILE: Root/setlocal.cmd
|
||||
:: PURPOSE: Bypass for the stupid setlocal in CMD Batch
|
||||
:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel@freenet.de>
|
||||
::
|
||||
::
|
||||
@echo off
|
||||
if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0
|
||||
if %_ROSBE_DEBUG% == 1 (
|
||||
@echo on
|
||||
)
|
||||
|
||||
|
||||
if not "%_ROSBE_ARCH%" == "" (
|
||||
set ROS_ARCH=%_ROSBE_ARCH%
|
||||
set ROS_PREFIX=%_ROSBE_ARCH%-pc-mingw32
|
||||
set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\%_ROSBE_ARCH%
|
||||
|
||||
REM HAXX
|
||||
|
||||
if "%_ROSBE_ARCH%" == "arm" (
|
||||
set _ROSBE_OBJPATH=%_ROSBE_ARM_OBJPATH%
|
||||
set _ROSBE_OUTPATH=%_ROSBE_ARM_OUTPATH%
|
||||
)
|
||||
if "%_ROSBE_ARCH%" == "ppc" (
|
||||
set _ROSBE_OBJPATH=%_ROSBE_PPC_OBJPATH%
|
||||
set _ROSBE_OUTPATH=%_ROSBE_PPC_OUTPATH%
|
||||
)
|
||||
if "%_ROSBE_ARCH%" == "amd64" (
|
||||
set _ROSBE_OBJPATH=%_ROSBE_AMD64_OBJPATH%
|
||||
set _ROSBE_OUTPATH=%_ROSBE_AMD64_OUTPATH%
|
||||
set ROS_PREFIX=x86_64-pc-mingw32
|
||||
set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\x86_64
|
||||
)
|
||||
|
||||
REM Check if existant arch
|
||||
|
||||
if not exist "%_ROSBE_TARGET_MINGWPATH%\." (
|
||||
echo Unsupported arch specified. Fallback to Default.
|
||||
pause
|
||||
set _ROSBE_OBJPATH=%_ROSBE_i386_OBJPATH%
|
||||
set _ROSBE_OUTPATH=%_ROSBE_i386_OUTPATH%
|
||||
set ROS_ARCH=
|
||||
set ROS_PREFIX=
|
||||
set _ROSBE_TARGET_MINGWPATH=
|
||||
)
|
||||
)
|
Loading…
Reference in New Issue
Block a user