From 686ef924fb16c62e037098c09bb8bc56f0767366 Mon Sep 17 00:00:00 2001 From: Constantin Michael Date: Fri, 25 Nov 2011 15:18:12 +0200 Subject: Corrections to Windows and MinGW build scripts --- test/windows/odb/setenv.bat | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'test/windows/odb/setenv.bat') diff --git a/test/windows/odb/setenv.bat b/test/windows/odb/setenv.bat index dd73cba..b4fc0db 100755 --- a/test/windows/odb/setenv.bat +++ b/test/windows/odb/setenv.bat @@ -10,13 +10,12 @@ set ORACLE=c:\projects\oracle set ORACLE64=c:\projects\oracle64 set QTCORE=c:\projects\qtcore set QTCORE64=c:\projects\qtcore64 -set "ORACLE_OPTIONS=-L -S" -set "NLSLANG=AMERICA_AMERICA.WE8MSWIN1252" -if defined NLS_LANG SET NLSLANG=NLS_LANGset "DIFF=c:\cygwin\bin\diff.exe -ubB" +set "NLS_LANG=AMERICA_AMERICA.WE8MSWIN1252" +set "DIFF=c:\cygwin\bin\diff.exe -ubB" rem set "DEVENV=c:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\IDE\devenv.com" set "DEVENV=c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\devenv.com" -set PATH=%ODB%\libodb\bin;%ODB%\libodb-sqlite\bin;%ODB%\libodb-mysql\bin;%ODB%\libodb-pgsql\bin;%ODB%\libodb-oracle\bin;%ODB%\libodb-boost\bin;%ODB%\libodb-qt\bin;%MYSQL%\bin;%SQLITE%\bin;%PGSQL%\bin;%ORACLE%\bin;%QTCORE%\bin;%PATH% -set PATH=%ODB%\libodb\bin64;%ODB%\libodb-sqlite\bin64;%ODB%\libodb-mysql\bin64;%ODB%\libodb-pgsql\bin64;%ODB%\libodb-oracle\bin64;%ODB%\libodb-boost\bin64;%ODB%\libodb-qt\bin64;%MYSQL64%\bin;%SQLITE%\bin64;%PGSQL64%\bin;%ORACLE64%\bin;%QTCORE64%\bin;%PATH% +set PATH=%ODB%\libodb\bin;%ODB%\libodb-sqlite\bin;%ODB%\libodb-mysql\bin;%ODB%\libodb-pgsql\bin;%ODB%\libodb-oracle\bin;%ODB%\libodb-boost\bin;%ODB%\libodb-qt\bin;%MYSQL%\bin;%SQLITE%\bin;%PGSQL%\bin;%ORACLE%;%QTCORE%\bin;%PATH% +set PATH=%ODB%\libodb\bin64;%ODB%\libodb-sqlite\bin64;%ODB%\libodb-mysql\bin64;%ODB%\libodb-pgsql\bin64;%ODB%\libodb-oracle\bin64;%ODB%\libodb-boost\bin64;%ODB%\libodb-qt\bin64;%MYSQL64%\bin;%SQLITE%\bin64;%PGSQL64%\bin;%ORACLE64%\bin;%QTCORE64%;%PATH% if "_%1_" == "__" goto end -- cgit v1.1