From 141e34f9556593e92cc8f7ecf3c95734fa81a7d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Thu, 10 Aug 2017 13:43:22 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@271 a8b55f48-bf90-11e4-a774-851b48703e85 --- make_libs.bat | 4 ++-- project_fs/projectfilesystemplugin.pro | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/make_libs.bat b/make_libs.bat index 8838f07..7bc2b1f 100644 --- a/make_libs.bat +++ b/make_libs.bat @@ -1,6 +1,6 @@ @echo off set ARCH=%~1 -set PATH=C:\mingw\7_1_x%ARCH%\bin;C:\Qt\qt487_win%ARCH%\bin;C:\cmake\bin -set Qt5_DIR=C:\Qt\qt591_win%ARCH% +set PATH=%SDK_MINGW_DIR%%ARCH%\bin;%SDK_QT4_DIR%%ARCH%\bin;%SDK_CMAKE_DIR%\bin +set Qt5_DIR=%SDK_QT5_DIR%%ARCH% mkdir ..\libs_build_win%ARCH% cd ../libs_build_win%ARCH% && cmake_mgw ../libs && make install -j8 && cd ../libs && pause diff --git a/project_fs/projectfilesystemplugin.pro b/project_fs/projectfilesystemplugin.pro index 2211f29..ec797d3 100644 --- a/project_fs/projectfilesystemplugin.pro +++ b/project_fs/projectfilesystemplugin.pro @@ -27,13 +27,11 @@ RESOURCES += \ ## Either set the IDE_SOURCE_TREE when running qmake, ## or set the QTC_SOURCE environment variable, to override the default setting -isEmpty(IDE_SOURCE_TREE): IDE_SOURCE_TREE = $$(QTC_SOURCE) -isEmpty(IDE_SOURCE_TREE): IDE_SOURCE_TREE = "D:/sdk/qt-creator-git/qt-creator" +isEmpty(IDE_SOURCE_TREE): IDE_SOURCE_TREE = $$(SDK_QTCREATOR_SRC) ## Either set the IDE_BUILD_TREE when running qmake, ## or set the QTC_BUILD environment variable, to override the default setting -isEmpty(IDE_BUILD_TREE): IDE_BUILD_TREE = $$(QTC_BUILD) -isEmpty(IDE_BUILD_TREE): IDE_BUILD_TREE = "D:/sdk/qt-creator-git/build" +isEmpty(IDE_BUILD_TREE): IDE_BUILD_TREE = $$(SDK_QTCREATOR_BUILD) ## uncomment to build plugin into user config directory ## /plugins/