Philippe Renon
38682f38f4
Merge remote-tracking branch 'origin/filnet/OP-1818_update_OP_toolchain_for_compiling_osgearth' into next
...
Conflicts:
make/tools.mk
2015-04-25 17:24:31 +02:00
Philippe Renon
5b660a1fe0
Merge remote-tracking branch 'origin/filnet/OP-1796_upgrade_gcs_to_qt_5_4_1' into next
...
Conflicts:
make/tools.mk
2015-04-25 17:21:33 +02:00
Philippe Renon
33c569abf6
OP-1796 updated Qt download urls to new location
2015-04-17 08:38:10 +02:00
Philippe Renon
1ef5d644b8
OP-1818 applied review comments
2015-04-09 21:11:15 +02:00
Philippe Renon
bc3266d689
OP-1818 added missing MSYS_URL to tools.mk
2015-04-05 18:56:21 +02:00
Philippe Renon
8525ef1287
OP-1818 added MD5_GEN_TEMPLATE used to generate md5 signature files
2015-04-05 18:40:52 +02:00
Philippe Renon
e61aefdfee
OP-1818 define ZIP variable in make/tools.mk
2015-04-05 18:38:56 +02:00
Philippe Renon
2c2d50908f
OP-1818 added MSYS to toolchain (windows only) - needed to compile osg dependencies
2015-04-05 18:38:15 +02:00
Philippe Renon
7612b15213
OP-1818 added CMake to toolchain - use 'make cmake_install' (windows only)
2015-04-05 18:36:56 +02:00
James Duley
199ee15d84
OP-1792 makefile tidy: removed unneeded quotes for OPENSSL that break copydata makefile
2015-04-01 09:19:09 +13:00
Philippe Renon
f2ac9b2522
OP-1796 defined OPENSLL_CONF env variable so openssl stops complaining about a missing openssl.cfg file (not related to qt upgrade...)
2015-03-19 21:02:37 +01:00
Philippe Renon
2a02c974bc
OP-1796 isolate windows specific variables in tools.mk (minor cleanup in preparation of the osgearth merge)
2015-03-19 21:01:06 +01:00
Philippe Renon
db31c293c4
OP-1796 upgraded GCS to qt 5.4.1 (all OSes) - tested on win32 and linux64
2015-03-19 20:59:38 +01:00
abeck70
53482be09c
OP-1721 C++ and ARM tools
...
Enable revo C++ support:
1. Set USE_CXX to enable compliation and linkage of C++ source code
2. Disables rtti and exceptions
3. operator new and delete call pios malloc/free
4. Static constructor invocation supported
5. Additional methods, compile options, and need to have main as a cpp to solve various link issues when using static constructors but to avoid adding unnecessary libs.
6. Upgrade arm tools
2015-02-13 12:56:04 +11:00
m_thread
fe404f1e33
OP-1628 Fixed DFUUtil installation in Tools.mk
2015-01-19 23:59:44 +01:00
abeck70
3e830b91d5
macqt54 remove files no longer avail
2015-01-07 12:45:25 +11:00
abeck70
d8792826ee
macqt5.4 qt_addons fix
2015-01-07 12:36:00 +11:00
abeck70
e272ddd264
additional mac 5.4 changes
2015-01-07 11:35:22 +11:00
abeck70
59be86bc70
qt5.4 mac tools.mk support
...
Coded....testing now.
2015-01-07 11:01:39 +11:00
Philippe Renon
ab952b0f03
OP-1656 minor post Qt 5.4.0 upgrade cleanups
2015-01-04 12:33:42 +01:00
Philippe Renon
5b2eac268a
OP-1656 upgraded to Qt 5.4.0 (linux) - code compiles - GCS not tested...
2015-01-02 22:22:31 +01:00
Philippe Renon
ac6e0b0699
OP-1656 upgraded to Qt 5.4.0 (windows) - code compiles - GCS not tested...
2014-12-22 21:17:52 +01:00
Fredrik Larsson
cfa0ef4671
For Mac testing Qt revert
2014-10-02 20:54:24 +10:00
Fredrik Larson
18b35e858f
Mac stuff
2014-09-27 21:39:25 +10:00
abeck70
81b2224b7b
OSX Qt5.3.2 changes to tools.mk
2014-09-17 21:33:02 +10:00
Fredrik Larsson
aebf41aad7
Merge remote-tracking branch 'origin/parched/OP-1478_fix_win_qtc_variables' into next
2014-09-14 22:50:43 +10:00
James Duley
5d55766573
OP-1478 fix_win_qtc_variables: reworded comments
2014-09-14 11:55:32 +12:00
James Duley
684180ef87
OP-1478: added a qmake variable OPENSSL_DIR
2014-09-13 17:48:30 +12:00
Alessio Morale
2907af618f
OP-1465 - fixes for some review suggestions
2014-09-08 14:39:41 +02:00
Alessio Morale
ec07016aee
OP-1465 - Fix build on windows, force the removal on cleanup
2014-09-01 14:51:43 +02:00
Alessio Morale
c5d57a763e
OP-1465 - Update stm32flash repository to https://code.google.com/p/stm32flash/ and fetch a newer version (a358bd1f025d)
2014-08-29 21:13:13 +02:00
Fredrik Larson
8c65661e54
Merge remote-tracking branch 'origin/parched/OP-1460_copy_icu_again' into next
2014-08-28 09:59:25 +10:00
Fredrik Larson
8110d92059
Don't need sudo for brew
2014-08-28 04:50:30 +10:00
James Duley
135b5d635e
updated icu from 51 to 52
2014-08-26 10:30:24 +12:00
James Duley
47e110050d
Merge branch 'python_fixes' into OP-1324_fix_build_when_python_isnt_python2
2014-08-19 11:50:41 +12:00
James Duley
c2af28246f
redirect stderr to stdout for shell python --version
2014-08-19 11:50:03 +12:00
James Duley
a4efd8539a
Merge branch 'python_fixes' into OP-1324_fix_build_when_python_isnt_python2
2014-08-19 10:42:33 +12:00
James Duley
f4ddbe53eb
fixed whitespace
2014-08-19 10:41:24 +12:00
Corvus Corax
bc8ccb7be7
Revert "Revert "Merge remote-tracking branch 'origin/parched/OP-1324_fix_build_when_python_isnt_python2' into next""
...
This reverts commit 449653f01e
2014-08-16 23:59:37 +02:00
Fredrik Larson
c620c7fc29
Change message about installing 7zip on Linux, packaging changed in latest
...
LTS
2014-08-17 07:19:29 +10:00
Fredrik Larson
449653f01e
Revert "Merge remote-tracking branch 'origin/parched/OP-1324_fix_build_when_python_isnt_python2' into next"
...
This reverts commit 4592de13bda309537e62
2014-08-16 23:53:02 +10:00
Corvus Corax
4592de13bd
Merge remote-tracking branch 'origin/parched/OP-1324_fix_build_when_python_isnt_python2' into next
2014-08-16 13:53:16 +02:00
abeck70
eefe40c6a6
changed qt patch to mac target
2014-08-14 06:56:31 +10:00
abeck70
7cd4164358
following op-11400 qt 531 upgrade branch. Recommit mac tools.mk changes
2014-08-14 06:25:18 +10:00
Fredrik Arvidsson
61d45181a6
OP-1398 OP-1399 OP-1400 OP-1401 Qt 5.3.1 upgrade. Cleaning up merge artifacts committed by mistake.
2014-08-12 07:37:23 +02:00
Fredrik Arvidsson
1558c6d735
Merge remote-tracking branch 'origin/shared/OP-1398_qt531_upgrade' into thread/OP-1400_Qt_5.3.1_Upgrade
...
Conflicts:
make/tools.mk
2014-08-11 23:25:37 +02:00
m_thread
717de29648
OP-1400 Upgraded make and copydata files to use Qt 5.3.1 Opensource.
2014-08-08 13:48:36 +02:00
Philippe Renon
5ee35cdd75
OP-1398 OP-1399 Windows Qt 5.3.1 upgrade - upgraded qt_sdk_install to install Qt 5.3.1
2014-07-14 18:26:25 +02:00
Laurent Lalanne
db63158bc6
OP-1390 Updated wiki link for download, removed extra space added.
2014-07-04 18:36:43 +02:00
Laurent Lalanne
99db0c5025
OP-1390 First commit - Need valid download link
2014-07-04 17:21:39 +02:00
