commit c7c9744368cfabfaf29a6071954eb6c1500e6d55 Author: Georg Baum <b...@lyx.org> Date: Sun Jun 19 13:15:50 2016 +0200
Adjust dep path in build batches Another location where paths are stored... diff --git a/development/cmake/build5-2015-installer.bat b/development/cmake/build5-2015-installer.bat index 8baf487..27d6826 100644 --- a/development/cmake/build5-2015-installer.bat +++ b/development/cmake/build5-2015-installer.bat @@ -21,7 +21,7 @@ rmdir /s/q %LYX_BUILD%\LYX_INSTALLED 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=D:\LyXGit\Master\lyx-windows-deps-msvc2010 +set GNUWIN32_DIR=D:\LyXGit\Master\lyx-windows-deps-msvc2015 REM MSVC 2015 tools call "C:\Programme (x86)\MSVC2015\VC\vcvarsall.bat" x86 diff --git a/development/cmake/build5-2015.bat b/development/cmake/build5-2015.bat index bbacf84..bda1f45 100644 --- a/development/cmake/build5-2015.bat +++ b/development/cmake/build5-2015.bat @@ -36,7 +36,7 @@ REM Add path to qmake here or set PATH correctly on your system. set PATH=C:\Qt\Qt5.6.0-MSVC2015\5.6\msvc2015\bin;%PATH% REM Edit pathes here or set the environment variables on you system. -set GNUWIN32_DIR=D:\LyXGit\Master\lyx-windows-deps-msvc2010 +set GNUWIN32_DIR=D:\LyXGit\Master\lyx-windows-deps-msvc2015 set LYX_SOURCE=D:\LyXGit\Master\ set LYX_BUILD=D:\LyXGit\Master\compile-2015