From: Peter Kümmel Date: Tue, 19 Jan 2016 16:39:18 +0000 (+0100) Subject: use Qt default path, don't touch source tree X-Git-Tag: 2.2.0beta1~140 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=0477e01d3e231843397e5dbef5e269695e0a33b2;p=features.git use Qt default path, don't touch source tree --- diff --git a/development/cmake/build5-2010-installer.bat b/development/cmake/build5-2010-installer.bat index e0d3c7de47..c32d97bc8a 100644 --- a/development/cmake/build5-2010-installer.bat +++ b/development/cmake/build5-2010-installer.bat @@ -5,32 +5,30 @@ REM Create a link and add cmd.exe /k in the preferences in front of the mingw. ::echo off REM Install Qt from qt.io -set PATH=C:\Qt\Qt5-5-1-2010\5.5\msvc2010\bin;%PATH% +set PATH=C:\Qt\Qt5.5.1\5.5\msvc2010\bin;%PATH% set LYX_SOURCE=%~DP0..\.. - -REM first remove an existing compilation to assure a clean version -RMDIR /S /Q %LYX_SOURCE%\build-result-5-2010 - -set LYX_BUILD=%LYX_SOURCE%\build-result-5-2010 +set LYX_BUILD=%LYX_SOURCE%\..\build-result-5-2010 echo LyX source: %LYX_SOURCE% echo LyX build : %LYX_BUILD% + +REM first remove an existing compilation to assure a clean version +mkdir %LYX_BUILD% +rmdir /s/q %LYX_BUILD% +mkdir %LYX_BUILD% + + REM Download http://sourceforge.net/projects/lyx/files/Win_installers/Dependencies/lyx20-deps-msvc2010-x86.zip REM Extract on the same level as LyX sources -set GNUWIN32_DIR=%LYX_SOURCE%\lyx-windows-deps-msvc2010 +set GNUWIN32_DIR=%LYX_SOURCE%\..\lyx20-deps-msvc2010-x86\deps20 REM MSVC 2010 tools call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86 - -mkdir %LYX_BUILD% -rmdir /s/q %LYX_BUILD% -mkdir %LYX_BUILD% - cd %LYX_BUILD% -cmake %LYX_SOURCE% -G"NMake Makefiles" -DLYX_PYTHON_EXECUTABLE=%GNUWIN32_DIR%\Python\python -DLYX_3RDPARTY_BUILD=1 -DLYX_ENABLE_CXX11=ON -DLYX_USE_QT=QT5 -DLYX_MERGE_REBUILD=1 -DLYX_MERGE_FILES=1 -DLYX_NLS=1 -DLYX_INSTALL=1 -DLYX_RELEASE=1 -DLYX_CONSOLE=OFF +cmake %LYX_SOURCE% -G"NMake Makefiles" -DLYX_PYTHON_EXECUTABLE=%GNUWIN32_DIR%\Python\python -DLYX_3RDPARTY_BUILD=1 -DLYX_USE_QT=QT5 -DLYX_MERGE_REBUILD=1 -DLYX_MERGE_FILES=1 -DLYX_NLS=1 -DLYX_INSTALL=1 -DLYX_RELEASE=1 -DLYX_CONSOLE=OFF nmake doc nmake translations