diff options
Diffstat (limited to 'test/windows')
| -rwxr-xr-x | test/windows/odb/build.bat | 1 | ||||
| -rw-r--r-- | test/windows/odb/default.options | 6 | ||||
| -rw-r--r-- | test/windows/odb/setenv.bat | 7 |
3 files changed, 8 insertions, 6 deletions
diff --git a/test/windows/odb/build.bat b/test/windows/odb/build.bat index bb540d4..56d0d64 100755 --- a/test/windows/odb/build.bat +++ b/test/windows/odb/build.bat @@ -36,6 +36,7 @@ set "failed=" if "_%2_" == "_9_" set "vcver=9" if "_%2_" == "_10_" set "vcver=10" +if "_%2_" == "_11_" set "vcver=11" if "_%vcver%_" == "__" ( echo unknown VC++ version %2 diff --git a/test/windows/odb/default.options b/test/windows/odb/default.options index 8334a81..95f42e8 100644 --- a/test/windows/odb/default.options +++ b/test/windows/odb/default.options @@ -1,4 +1,4 @@ --I C:\projects\boost-vc10 --I C:\projects\qtcore-vc10\include --I C:\projects\qtcore-vc10\include\QtCore +-I C:\projects\boost-vc10.0 +-I C:\projects\qtcore-vc10.0\include +-I C:\projects\qtcore-vc10.0\include\QtCore #-D MSSQL_SERVER_VERSION=900
\ No newline at end of file diff --git a/test/windows/odb/setenv.bat b/test/windows/odb/setenv.bat index 6da49ba..f9fdea8 100644 --- a/test/windows/odb/setenv.bat +++ b/test/windows/odb/setenv.bat @@ -10,17 +10,18 @@ rem set CL=/DMSSQL_SERVER_VERSION=900 set ODB=c:\projects\odb set MYSQL=c:\projects\mysql set MYSQL64=c:\projects\mysql64 -set SQLITE=c:\projects\sqlite-vc%1 +set SQLITE=c:\projects\sqlite-vc%1.0 set PGSQL=c:\projects\pgsql set PGSQL64=c:\projects\pgsql64 set ORACLE=c:\projects\oracle set ORACLE64=c:\projects\oracle64 -set QTCORE=c:\projects\qtcore-vc%1 -set QTCORE64=c:\projects\qtcore64-vc%1 +set QTCORE=c:\projects\qtcore-vc%1.0 +set QTCORE64=c:\projects\qtcore64-vc%1.0 rem set "NLS_LANG=AMERICA_AMERICA.WE8MSWIN1252" set "DIFF=c:\cygwin\bin\diff.exe -ubB" if "_%1_" == "_9_" set "DEVENV=c:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\IDE\devenv.com" if "_%1_" == "_10_" set "DEVENV=c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\devenv.com" +if "_%1_" == "_11_" set "DEVENV=c:\Program Files (x86)\Microsoft Visual Studio 11.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-mssql\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-mssql\bin64;%ODB%\libodb-boost\bin64;%ODB%\libodb-qt\bin64;%MYSQL64%\bin;%SQLITE%\bin64;%PGSQL64%\bin;%ORACLE64%;%QTCORE64%\bin;%PATH% |