rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
Code Issues Releases Activity

package: (win) add comment regarding newer Qt SDK location and SDL requirements

Browse Source
This commit is contained in:
Oleg Semyonov 2011-05-28 11:45:22 +03:00
parent f676859854
commit 0867b3b729
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
make/winx86/README.txt
View File

@ -33,11 +33,14 @@ It is expected that you have the following tools installed into the listed
locations (but any other locations are fine as well): locations (but any other locations are fine as well):
- Python in C:\Python27 - Python in C:\Python27
- QtSDK in C:\Qt\2010.05 - QtSDK in C:\Qt\2010.05 or C:\QtSDK (depending on SDK version)
- CodeSourcery G++ in %ProgramFiles%\CodeSourcery\Sourcery G++ Lite - CodeSourcery G++ in %ProgramFiles%\CodeSourcery\Sourcery G++ Lite
- msysGit in %ProgramFiles%\Git - msysGit in %ProgramFiles%\Git
- Unicode NSIS in %ProgramFiles%\NSIS\Unicode - Unicode NSIS in %ProgramFiles%\NSIS\Unicode
- OpenOCD in C:\OpenOCD\0.4.0\bin - OpenOCD in C:\OpenOCD\0.4.0\bin (optional)
The SDL library and headers should be installed into Qt directories to build
the GCS. Check the wiki or ground/openpilotgcs/copydata.pro for details.
Also it is assumed that you have the C:\Program Files\Git\cmd\ directory in Also it is assumed that you have the C:\Program Files\Git\cmd\ directory in
the PATH. Usually this is the case for msysGit installation if you have chosen the PATH. Usually this is the case for msysGit installation if you have chosen

7
make/winx86/cmd/sh.cmd
View File

@ -38,6 +38,9 @@ rem As a result, the SDL headers will not be found, if they were copied into
rem QtSDK's MinGW directory. In that case make sure that you have correct rem QtSDK's MinGW directory. In that case make sure that you have correct
rem directories specified here. rem directories specified here.
rem rem
rem Also the SDL should be installed into Qt directories to build the GCS.
rem Check the wiki or ground/openpilotgcs/copydata.pro for details.
rem
rem Also you can add any paths below just by adding extra 'call :which' rem Also you can add any paths below just by adding extra 'call :which'
rem lines with the following parameters: rem lines with the following parameters:
rem - environment variable which will be set to the tool location, if found; rem - environment variable which will be set to the tool location, if found;
@ -51,8 +54,12 @@ set NOT_FOUND=
set PATH_DIRS= set PATH_DIRS=
call :which MSYSGIT "%ProgramFiles%\Git\bin" git.exe 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 QTMINGW "C:\Qt\2010.05\mingw\bin" mingw32-make.exe
call :which QTSDK "C:\Qt\2010.05\qt\bin" qmake.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 CODESOURCERY "%ProgramFiles%\CodeSourcery\Sourcery G++ Lite\bin" cs-make.exe call :which CODESOURCERY "%ProgramFiles%\CodeSourcery\Sourcery G++ Lite\bin" cs-make.exe
call :which PYTHON "C:\Python27" python.exe call :which PYTHON "C:\Python27" python.exe
call :which UNSIS "%ProgramFiles%\NSIS\Unicode" makensis.exe call :which UNSIS "%ProgramFiles%\NSIS\Unicode" makensis.exe