From: Georg Baum Date: Sun, 19 Jun 2016 11:15:50 +0000 (+0200) Subject: Adjust dep path in build batches X-Git-Tag: 2.3.0alpha1~1428 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=c7c9744368cfabfaf29a6071954eb6c1500e6d55;p=features.git 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 8baf4879c2..27d6826e63 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 bbacf8453f..bda1f45c4d 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