1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-10 18:24:11 +01:00
Commit Graph

27 Commits

Author SHA1 Message Date
James Duley
d1229adc37 OP-1666 deb tidy and OP-1663: move Qt inside OP
lib dir to avoid conflict and match Qt dir structure so their rpath is correct. part 2 (fix part 1)
2015-01-10 11:41:24 +13:00
James Duley
95fe38143f OP-1666 deb tidy and OP-1663: move Qt inside OP
lib dir to avoid conflict and match Qt dir structure so their rpath is correct
2015-01-10 10:53:22 +13:00
James Duley
240f862196 OP-1666 deb tidy: Removed FORCE_COPY_QT
It does not really make sense because it is designed for OP Qt
which is copied by default if it exists.
2015-01-10 00:19:40 +13:00
James Duley
04525a0dfd OP-1657 Removed linux bin wrapper 2014-12-24 10:30:20 +13:00
James Duley
5cc91467ef OP-1478 fix_win_qtc_variables: added MESAWIN_DIR variable 2014-09-14 12:50:30 +12:00
James Duley
18ad22a177 OP-1478: allow alternate SDL_DIR or OPENSSL_DIR 2014-09-14 12:01:14 +12:00
James Duley
684180ef87 OP-1478: added a qmake variable OPENSSL_DIR 2014-09-13 17:48:30 +12:00
James Duley
17bb1d2fc0 OP-1478 fix win qtc vairables: fixed TOOLS_DIR check 2014-09-13 16:37:30 +12:00
James Duley
ea64284d7d OP-1478: added a qmake variable SDL_DIR 2014-09-13 15:24:52 +12:00
James Duley
67e7801949 OP-1478: move TOOLS_DIR out of linux scope 2014-09-08 21:29:44 +12:00
James Duley
e5d1676d44 OP-1463 allow for alternative_OPENPILOT_TOOLS_DIR:added check to see if it is set and use it if possible 2014-08-29 09:01:30 +12:00
James Duley
21d8159135 OP-1461 fix copyqt logic: renamed variables 2014-08-28 08:56:27 +12:00
James Duley
3890c7858f OP-1461 fix copyqt logic:removed use of environment variable in openpilotgcs.pri
and force copy Qt libs when making package
2014-08-26 11:37:41 +12:00
James Duley
41fdf4e81f OP-1338 changed to check if qt in tools 2014-08-21 08:49:39 +12:00
James Duley
95676043d7 on linux check whether QT_INSTALL_LIBS are /usr/lib/* set copyqt to 0 if that is the case 2014-07-07 08:43:04 +12:00
Alessio Morale
6d63b6b9b0 Merge remote-tracking branch 'origin/fnurgel/OP-1162_linux_deb_packaging_qt5' into next 2014-01-18 14:18:46 +01:00
Mikael Blomqvist
c98b8b4763 Fix for broken dependency lookup during deb packaging 2014-01-11 01:11:00 +01:00
a*morale
4738e4eafc OP-1155 OSX Package: Add QtQuick plugin deployment to copydata.pro 2014-01-10 23:25:35 +01:00
Mikael Blomqvist
6379a7d937 deb package now bundles qt5 libs and goodies 2014-01-09 15:57:12 +01:00
Philippe Renon
09b22a18f4 [OP-835] Qt 5.1.0 - fixed ((packed)) pragma issue introduced by MinGW upgrade 2013-09-15 23:39:48 +02:00
Philippe Renon
4fd04d38f3 [OP-835] Qt 5.1.0 - replace $$PWD with $$_PRO_FILE_PWD_ (don't know why...) 2013-09-15 23:25:54 +02:00
Oleg Semyonov
5bb6b56b4a OP-772: Normalize line endings 2013-04-05 23:46:56 +03:00
Peter Gunnarsson
76ee2c060c OP-520 Change $$qtLibraryTarget to $$qtLibraryName 2011-08-04 15:17:08 +02:00
James Cotton
45244e3df5 On OSX make the plugins in .app/Contents/Plugins instead of PlugIns 2011-06-01 13:58:49 -05:00
osnwt
449474b66c Windows GCS installer cleanup.
Moved obsolete Wix installer into Experimental branch. NSIS installer moved one level up. Now it supports new build directory structure, does not require to be copied into it and can be built using packaging/winx86/Makefile.cmd or as a qmake-generated "installer" target (using "make installer"). NOTE: this target will NOT be built automatically, you have to build it yourself.

Install system requires Unicode NSIS installer and optionally uses SubWCRev.exe utility (from TortoiseSVN package) to extract some build info from local SVN copy (like revision number, etc.). This info then is available as a properties of installer executable and also used in the installer's executable file name. SubWCRev utility is optional, if it is not found - no extra info will be generated and used.

Also fixed unescaped backslash in openpilotgcs.pri (please check that it does not break !win32 builds).


git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2584 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-01-24 19:27:49 +00:00
cwabbott
8cddf2913d Only change COPY_DIR to cp -r -f if QMAKE_SH is defined, consistent with win32-g++ mkspec.
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2550 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-01-23 18:59:25 +00:00
stac
7195862d77 build: Move openpilotgcs into its own subdirectory
This will allow us to build a parent project for
qt-creator that sits above both openpilotgcs and
uavobjgenerator so that we can build both projects
at the same time.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2528 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-01-22 17:40:26 +00:00