From dcfa5f0f124c10faa54c91d592415dffa32fd42a Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Thu, 18 Jul 2002 19:30:10 +0000 Subject: [PATCH] Moved epics path macros to optional section. Added HOST_ARCH definition. --- startup/borland.bat | 8 ++++++-- startup/win32.bat | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/startup/borland.bat b/startup/borland.bat index 7436ec902..cf71278b8 100755 --- a/startup/borland.bat +++ b/startup/borland.bat @@ -37,12 +37,16 @@ set PATH=%PATH%;c:\Borland\Bcc55\bin REM --------------- EPICS ----------------------------- REM R3.14 requirements set EPICS_HOST_ARCH=win32-x86-borland -set PATH=%PATH%;G:\epics\base\bin\%EPICS_HOST_ARCH% -set PATH=%PATH%;G:\epics\extensions\bin\%EPICS_HOST_ARCH% REM =================================================== REM ====== OPTIONAL ENVIRONMENT VARIABLES FOLLOW ====== +REM -------------------- EPICS ------------------------ +REM HOST_ARCH needed for Makefile.Host builds +set HOST_ARCH=Borland +set PATH=%PATH%;G:\epics\base\bin\%EPICS_HOST_ARCH% +set PATH=%PATH%;G:\epics\extensions\bin\%EPICS_HOST_ARCH% + REM --------------- GNU make flags -------------------- REM set MAKEFLAGS=-w diff --git a/startup/win32.bat b/startup/win32.bat index f41dc03d3..4723d3578 100755 --- a/startup/win32.bat +++ b/startup/win32.bat @@ -37,12 +37,16 @@ call "C:\Program files\Microsoft Visual Studio\Vc98\bin\vcvars32.bat" REM --------------- EPICS ----------------------------- REM R3.14 requirements set EPICS_HOST_ARCH=win32-x86 -set PATH=%PATH%;G:\epics\base\bin\%EPICS_HOST_ARCH% -set PATH=%PATH%;G:\epics\extensions\bin\%EPICS_HOST_ARCH% REM =================================================== REM ====== OPTIONAL ENVIRONMENT VARIABLES FOLLOW ====== +REM ---------------- EPICS tools ---------------------- +REM HOST_ARCH needed for Makefile.Host builds +set HOST_ARCH=WIN32 +set PATH=%PATH%;G:\epics\base\bin\%EPICS_HOST_ARCH% +set PATH=%PATH%;G:\epics\extensions\bin\%EPICS_HOST_ARCH% + REM --------------- GNU make flags -------------------- REM set MAKEFLAGS=-w