From 08034df50ee0eabcecf645d84c7bda9afe116a85 Mon Sep 17 00:00:00 2001 From: Oleg Semyonov Date: Sun, 29 Jul 2012 23:55:51 +0300 Subject: [PATCH] Windows packaging: update sh.cmd script for QtSDK 1.2.1 --- make/winx86/README.txt | 6 +++--- make/winx86/cmd/sh.cmd | 8 ++------ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/make/winx86/README.txt b/make/winx86/README.txt index 17477d098..3bc070ee1 100644 --- a/make/winx86/README.txt +++ b/make/winx86/README.txt @@ -33,7 +33,7 @@ It is expected that you have the following tools installed into the listed locations (but any other locations are fine as well): - Python in C:\Python27 - - QtSDK in C:\Qt\2010.05 or C:\QtSDK (depending on SDK version) + - QtSDK in C:\QtSDK (depending on SDK version) - CodeSourcery G++ in %ProgramFiles%\CodeSourcery\Sourcery G++ Lite - msysGit in %ProgramFiles%\Git - Unicode NSIS in %ProgramFiles%\NSIS\Unicode @@ -190,8 +190,8 @@ This set of scripts uses the MSYS package included into the msysGit distribution and MinGW make included into the QtSDK package. The sh.cmd, shell_script.reg and this README.txt files were written -by Oleg Semyonov (os-openpilot-org@os-propo.info) for the OpenPilot -project and are licensed under CC-BY-SA terms: +by Oleg Semyonov (os@openpilot.org) for the OpenPilot project and +are licensed under CC-BY-SA terms: http://creativecommons.org/licenses/by-sa/3.0/ diff --git a/make/winx86/cmd/sh.cmd b/make/winx86/cmd/sh.cmd index 480044ab7..d9e74033b 100644 --- a/make/winx86/cmd/sh.cmd +++ b/make/winx86/cmd/sh.cmd @@ -54,12 +54,8 @@ set NOT_FOUND= set PATH_DIRS= call :which MSYSGIT "%ProgramFiles%\Git\bin" git.exe -rem These two lines for qt-sdk-win-opensource-2010.05.exe: -call :which QTMINGW "C:\Qt\2010.05\mingw\bin" mingw32-make.exe -call :which QTSDK "C:\Qt\2010.05\qt\bin" qmake.exe -rem These two lines for Qt_SDK_Win_offline_v1_1_1_en.exe: -rem call :which QTMINGW "C:\QtSDK\mingw\bin" mingw32-make.exe -rem call :which QTSDK "C:\QtSDK\Desktop\Qt\4.7.3\mingw\bin" qmake.exe +call :which QTMINGW "C:\QtSDK\mingw\bin" mingw32-make.exe +call :which QTSDK "C:\QtSDK\Desktop\Qt\4.8.1\mingw\bin" qmake.exe call :which CODESOURCERY "%ProgramFiles%\CodeSourcery\Sourcery G++ Lite\bin" cs-make.exe call :which PYTHON "C:\Python27" python.exe call :which UNSIS "%ProgramFiles%\NSIS\Unicode" makensis.exe