fly/flightgear
1
0
Fork 0
Code Activity
12738 commits 1 branch 0 tags 41 MiB
Commit graph

175 commits

Author SHA1 Message Date
James Turner
80e45f6d9b Different solution for FGQCanvas install 
Move the install line back inside the subdir, but pull in the extra
config file so the install-bindir is defined.
 2017-02-04 08:25:41 +01:00
Erik Hofman
e31d6b083e Pick a default build type if none is specified 2017-01-26 14:48:35 +01:00
James Turner
15dbe1069d Bump the minimum Qt version for Remote-canvas. 
QByteArrayList needs 5.4, not 5.3

Also flip the default to off of building the remote-canvas, to avoid
people getting caught out.
 2017-01-24 10:34:56 +00:00
Erik Hofman
40b6ca14e8 Move SIMD flags to CMAKE_CXX_FLAGS_RELEASE and fix a typo in the process 2017-01-20 14:56:50 +01:00
Erik Hofman
2408a3a28a Do not rely on SSE3, this is just a slight drawback 2017-01-06 15:10:34 +01:00
James Turner
4a3ee6a74a Relax base-package and SimGear version checks. 
As discussed on the devel list, only require the major+minor versions
of FG+SG+data to match by default. If we encounter a situation on
a release branch where stronger checks are needed, it’s easy to
restore.
 2017-01-05 11:09:41 +00:00
Florent Rougon
ea827f5677 Revert commits e1b65590, 0b1c3568 and 72886289 
Commit e1b65590cb was:

  Add the top-level options.xml and Translations directory moved out of
  FGData

Commit 0b1c356837 was:

  Make the FG installation prefix available to C++ code via config.h

Commit 7288628919 was:

  Load --help output and translated strings from
  $FG_INSTALL_PREFIX/share/flightgear

For the reasons of these revertings, see the thread at
<https://sourceforge.net/p/flightgear/mailman/flightgear-devel/thread/CAHtsj_eFdxLoXXoNq%3D3OKNRmyR6-FowFL97TASdQJx8N05Lmig%40mail.gmail.com/#msg35580548>,
including <https://sourceforge.net/p/flightgear/mailman/message/35584363/>,
<https://sourceforge.net/p/flightgear/mailman/message/35584803/> and
<https://sourceforge.net/p/flightgear/mailman/message/35585421/> (appearing
out-of-thread according to the SF mailing list archive...).
 2017-01-05 06:53:53 +01:00
Florent Rougon
e1b65590cb Add the top-level options.xml and Translations directory moved out of FGData 
Copy them to ${CMAKE_INSTALL_PREFIX}/share/flightgear at installation time.
 2016-12-29 11:33:19 +01:00
James Turner
106b62caa5 Make FGQCanvas a bit more optional. 2016-12-19 17:54:37 +00:00
Erik Hofman
7fe40ddb61 add SSE support for the C compiler (gcc and clang) 2016-12-18 09:40:46 +01:00
Erik Hofman
94ed70607b MSVC 2013+ for 64-bit automatically sets /arch:SSE2 and doesn't recognise te option 2016-12-17 10:51:01 +01:00
Erik Hofman
c9b01b1d69 Enable SSE and SSE2 by default 2016-12-16 10:50:24 +01:00
Durk Talsma
b0d707c3f4 Merge branch 'next' of ssh://git.code.sf.net/p/flightgear/flightgear into next 2016-11-20 12:54:56 +01:00
Durk Talsma
f7424271a7 Some prepratory work for FGTraffic 2020: Added utils/traffic, a sample C++ source/header file, and the necessary changes in the CMakefile system to allow automatic compilation. 2016-11-20 12:52:21 +01:00
James Turner
5d7b65477f Simplify MSVC detection to match SimGear. 2016-11-15 00:07:32 +01:00
James Turner
e2f7585d9c Use a Cmake imported target for SimGear 2016-10-30 22:15:54 +00:00
James Turner
8e451a05f1 Use Cmake 3.0, and enable C++11 support. 2016-10-24 22:53:55 +02:00
James Turner
c4f584dadf Rewrite Mac Event-Input code 2016-09-28 21:16:24 -05:00
James Turner
656326e48f Kill off legacy Debian multiarch support 
We require Cmake 2.8.11 now
 2016-09-27 17:18:58 -05:00
James Turner
8f3a98d004 Optionally use fixed osgDB build for linking 
This allows us to drop the /FORCE:MULTIPLE work-around.
 2016-08-16 12:59:52 +01:00
Erik Hofman
34d8f64f4d AeonWave is off by default 2016-08-05 10:58:05 +02:00
Erik Hofman
9ec4d7749f Add support for AeonWave 2016-08-04 18:43:10 +02:00
Bertrand Coconnier
0a3756ea01 Added the dependency to Shlwapi for the Windows build (needed by SimGear). 2016-07-03 15:38:14 +02:00
James Turner
a0b7abf7ff Remove FGAdmin 2016-06-15 22:31:47 +01:00
James Turner
ff222b108e VS2015 tweaks 2016-06-09 16:19:34 +01:00
James Turner
e7c7c5b226 Fix dependency on ‘version’ file 2016-06-09 11:04:32 +01:00
James Turner
0da1fc574d VS2015 compatability fixes. 2016-06-01 22:58:03 +01:00
James Turner
3c5340d98d Merge /u/edauvergne/flightgear/ branch fdm_restoration into next 
http://sourceforge.net/p/flightgear/flightgear/merge-requests/24/
 2015-12-10 22:35:07 +00:00
James Turner
5bf59d58c4 On Mac, force the macon-min-version value 
- Workaround for CMAKE_OSX_DEPLOYMENT_TARGET not behaving as it’s
  supposed to reliably.
 2015-12-08 20:47:02 +00:00
Edward d'Auvergne
acea7c422b Reactivated the UIUC, LaRCsim, and special purpose FDMs. 
As the FlightGear distribution ships aircraft based on these FDMs with each
release, the shipped FlightGear executables should therefore be able to handle
these aircraft.  For example the unique ornithopter can only be flown with the
UIUC FDM, hence it is available for download but will be non-functional for most
users.

This partly reverts commit e819a4aaa4 from Nov 1,
2011 which deactivated the compilation of these in the CMakeLists.txt file.

Signed-off-by: Edward d'Auvergne <edward@nmr-relax.com>
 2015-12-05 14:56:42 +01:00
James Turner
2314ccfe13 Developer-warnings 
- make some existing warnings developer-mode only
- add a warning about legacy aircraft path usage
 2015-11-13 22:13:44 +00:00
James Turner
3e64e276d7 Remove OldGNUInstallDirs helper 
- we require CMake 2.8.11 now
 2015-11-13 22:13:44 +00:00
James Turner
980a98b176 Silence more Clang (Xcode 7) warnings 2015-09-27 20:40:34 -05:00
James Turner
53b41d0284 Drop explicit SDK setting on Mac 2015-09-20 19:44:35 -05:00
James Turner
54de0e9206 RPATH handling for Mac. 2015-06-08 10:37:26 +01:00
James Turner
c98f8e4ac1 Explicit Mac SDK for the moment. 2015-04-11 21:58:55 +01:00
Rebecca N. Palmer
14405fe2e3 Fix compile with CMake 3.2.1, by Kevin Seroux 
Explicitly link X11, as this no longer comes with OpenGL
 2015-04-03 19:15:52 +01:00
James Turner
06a260822c Make 3.2.1 fix: make thread check platform specific. 2015-03-17 23:33:57 +00:00
James Turner
fe25c42408 Make flag Mac specific. 2015-03-17 23:27:25 +00:00
James Turner
a6b5ab7c74 Fix for Cmake 3.2.1 Mac SDK handling 2015-03-17 22:33:54 +00:00
Clément de l'Hamaide
ba386b314e Increase required CMake version 
Qt5 require CMake 2.8.11 or later http://doc.qt.io/qt-5/cmake-manual.html
 2015-03-14 18:09:19 +01:00
Clément de l'Hamaide
67d528a46c Show Qt paths in CMake 2015-03-12 09:45:00 +01:00
James Turner
a466dbce73 Very crude work on GUI base package selection. 
- feedback on wording greatly appreciated.
- needed to make nightly builds usable without bundled data.
 2015-03-08 00:42:05 +00:00
James Turner
f36c81c8cb Fix where we set OS-X deployment target. 2015-02-24 12:35:26 +00:00
James Turner
84b240b84c Adjust warning flags for Clang. 2015-02-12 16:24:27 +00:00
James Turner
211a4982c8 Force libc++ explicitly on Clang 2015-02-11 15:48:42 +00:00
James Turner
8c38cf5740 Better CMake policy detection 
- thanks to Rebecca Palmer for suggesting this!
 2015-02-10 17:12:01 +00:00
James Turner
891c8eaa9f Cmake policies conditional on Cmake version. 2015-02-09 16:42:58 +00:00
James Turner
b8c9cd454e Force 10.7 deployment version on Mac. 2015-02-09 15:11:28 +00:00
James Turner
7d9609116b - Make Qt check guarded by a CMake option 
- Only init QApplication if showing the launcher.
 2015-01-10 14:05:23 +00:00