From 5d9493623759b2071cd4c3b7ac1725b35f321838 Mon Sep 17 00:00:00 2001 From: mrexodia Date: Fri, 25 Aug 2017 09:54:35 +0200 Subject: [PATCH] PROJECT: updated dependencies + setenv.bat to reflect the wiki --- deps | 2 +- setenv.bat | 24 ++++-------------------- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/deps b/deps index 393ad663..7201f2d8 160000 --- a/deps +++ b/deps @@ -1 +1 @@ -Subproject commit 393ad6636e859d3f53847bb714ef695504b9524d +Subproject commit 7201f2d8de3f956300fed2453776f85c82fdf035 diff --git a/setenv.bat b/setenv.bat index 27d83810..09b37675 100644 --- a/setenv.bat +++ b/setenv.bat @@ -2,13 +2,11 @@ if "%OLDPATH%"=="" set OLDPATH=%PATH% -if "%QT32PATH%"=="" set QT32PATH=c:\Qt\qt-5.6.0-x86-msvc2013\5.6\msvc2013\bin -if "%QT64PATH%"=="" set QT64PATH=c:\Qt\qt-5.6.0-x64-msvc2013\5.6\msvc2013_64\bin -if "%QTCREATORPATH%"=="" set QTCREATORPATH=c:\Qt\qtcreator-4.0.0\bin +if "%QT32PATH%"=="" set QT32PATH=c:\Qt\qt-5.6.2-x86-msvc2013\5.6\msvc2013\bin +if "%QT64PATH%"=="" set QT64PATH=c:\Qt\qt-5.6.2-x64-msvc2013\5.6\msvc2013_64\bin +if "%QTCREATORPATH%"=="" set QTCREATORPATH=c:\Qt\qtcreator-4.3.1\bin if "%VSVARSALLPATH%"=="" set VSVARSALLPATH=c:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat if "%COVERITYPATH%"=="" set COVERITYPATH=c:\coverity\bin -if "%DOXYGENPATH%"=="" set DOXYGENPATH=C:\Program Files\doxygen\bin -if "%CHMPATH%"=="" set CHMPATH=c:\Program Files (x86)\Softany\WinCHM if "%1"=="x32" ( goto x32 @@ -16,12 +14,8 @@ if "%1"=="x32" ( goto x64 ) else if "%1"=="coverity" ( goto coverity -) else if "%1"=="doxygen" ( - goto doxygen -) else if "%1"=="chm" ( - goto chm ) else ( - echo "Usage: setenv x32/x64/coverity/doxygen/chm" + echo "Usage: setenv x32/x64/coverity" goto :eof ) @@ -44,14 +38,4 @@ goto :eof :coverity echo Setting Coverity in PATH set PATH=%PATH%;%COVERITYPATH% -goto :eof - -:doxygen -echo Setting Doxygen in PATH -set PATH=%PATH%;%DOXYGENPATH% -goto :eof - -:chm -echo Setting CHM in PATH -set PATH=%PATH%;%CHMPATH% goto :eof \ No newline at end of file