1
0
Fork 0
Commit graph

135 commits

Author SHA1 Message Date
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
James Turner
72e0ea9e40 Only set AUTOMOC for fglauncher target.
(Avoids pointless noise for all other targets)
2015-01-07 09:38:02 +00:00
James Turner
78e8f53312 In-app launcher for Mac, based on Qt5.
The old Mac launcher doesn’t work on Yosemite, add a tiny
Qt-based launcher inside the main process (no need to fork /
exec) which runs before the OSG window is created.

Will be merged for 3.4, hopefully with no impact on other
platforms.
2015-01-06 19:13:30 +00:00
James Turner
263bc56b4e FreeBSD fixes.
From:
http://svnweb.freebsd.org/ports/head/games/flightgear/files/
2014-11-13 15:15:52 +00:00
Thomas Geymayer
2520124e97 Update for OpenSceneGraph 3.3.2 API changes. 2014-08-09 19:13:39 +02:00
Thomas Geymayer
a948f68960 CMake: add UTF8-CPP to SimGear include directories. 2014-07-30 12:47:33 +02:00
Christian Schmitt
568dadc898 Only include IAX 3rdparty files if needed 2014-05-31 13:50:28 +02:00
Torsten Dreyer
8da690a2b7 set ENABLE_FLITE=On as default 2014-05-20 10:52:59 +02:00
Clément de l'Hamaide
6d6e45274f FGadmin: fix compilation, move CMake stuff to better place, remove old ./configure system 2014-04-30 20:34:05 +02:00
Torsten Dreyer
1c5c1b2cb1 Fix hts_engine cmake error 2014-04-30 09:26:58 +02:00
Torsten Dreyer
6ee2fcdd9e Allow using the system version of flite and the HTS engine
By default, if the system version exists and can be used,
then it will be used. Otherwise, the local version will be used

Original patch by  Saikrishna Arcot via
https://gitorious.org/fg/flightgear/merge_requests/1582
slightly modified
2014-04-28 21:33:48 +02:00
James Turner
7b2d710cd0 Add hts_engine 1.08 and flite_hts 1.05 code.
- Not compiled by default, nor hooked up to anything yet.
- Both libraries licensed under modified BSD license.
- Added top-level CMake file for both, to create a plain static
  library for each.
2014-03-10 09:32:43 +00:00
James Turner
230e157190 Raise required OSG version to 3.2.0 2014-02-19 11:00:14 -08:00
James Turner
1c286e4932 Remove some CMake search paths
As the comments says, none of these should be needed, or
they are added by CMake automatically.
2014-02-14 20:45:19 +00:00
Erik Hofman
9097f8aac3 Set JSBSim terrain handling code default to ON 2014-02-09 14:10:42 +01:00
Erik Hofman
73a519a95c Make the JSBSim terrain handling code compile time configurable by calling cmake -DJSBSIM_TERRAIN=1 2014-01-29 13:50:06 +01:00
James Turner
1a372d9366 Update image-server logic.
- no dependency on libJpeg or Simgear
- no duplicate rendering of the scene (uses a draw callback)
- supports other image types, eg PNG
- threaded so doesn't block the main loop ever
2014-01-27 09:08:34 +00:00
Clément de l'Hamaide
da05f403b1 Use GSM and Speex libraries from system if they are installed by Saikrishna Arcot 2014-01-23 17:46:49 +01:00
James Turner
590be3f8ff Initial integration of CrashRpt for Windows. 2014-01-18 14:51:19 +00:00
Rebecca Palmer
bf1fe65bc5 Disable screensaver: initial Linux-only implementation
Add a function fgOSDisableScreensaver() that attempts to disable the
screensaver (currently only succeeding on Linux), and call it on startup.

CMake option USE_DBUS (on by default), requires libdbus-1

Motivation: most screensavers do not monitor the joystick
https://bugs.launchpad.net/ubuntu/+source/flightgear/+bug/793599

Discussion: http://sourceforge.net/p/flightgear/mailman/message/31717061/
2013-12-15 21:18:22 +00:00
James Turner
4bb52e46df Kill of embedded-Simgear CMake mode.
This was a silly idea, CMake super-builds from fgmeta are the correct
approach to this going forward.
2013-09-28 14:17:53 +01:00
James Turner
97d89a0c47 Remove all references to libsvn from build. 2013-09-28 14:15:47 +01:00
Clément de l'Hamaide
bebc7235b3 Restore ENABLE_IAX 2013-09-27 20:24:42 +02:00
Clément de l'Hamaide
c022bb8d51 Move IAXClient library into 3rdparty directory
Remove ENABLE_IAX option
Add an improved FGCom standalone as part of FG in utils directory
2013-09-27 16:05:45 +02:00
James Turner
0206de2d2c Relocate Sqlite3 sources, upgrade to 3.8.0.2
Move sqlite source to a separate location, and build with
an intermediate library target. This permits us to set compile options
easier, including an important one, NDEBUG, which improves performance.

Sqlite 3.8.0.2 also includes an updated query planner which may improve
some queries, to be tested.
2013-09-26 09:52:41 +01:00
f-jjth
d03b44b662 FGCom integrated into FlightGear.
Disabled by default at build time.
2013-08-16 17:02:47 +01:00
hof
8c02a57ff8 Add libdl to FLTK_LIBRARIES when the system supports it. Required for libfltk1.3. 2013-07-18 08:50:22 +01:00
PlutoniumHeart
acf47d00d5 Replacing strdup with _strdup in MSVC 2013-03-07 00:00:47 -07:00
F-JJTH
9fb299b153 Display RTI status like it's done in Simgear 2013-02-18 09:18:39 +00:00
Thomas Geymayer
6c10f99573 Make compiling of all utils/tools optional 2013-02-12 17:38:46 +01:00
James Turner
ead3be2098 Boo, typo. 2013-01-26 14:44:03 +00:00
James Turner
53d9aa4963 Support optionally embedding simgear. 2013-01-26 15:32:18 +01:00
ThorstenB
0937d79075 Fixed incomplete copy&paste issue. 2012-12-01 11:06:50 +01:00
ThorstenB
3b6436bfb8 #946: some libraries not found on Ubuntu/Debian
Ubuntu/Debian introduced "multiarch" library directories, which is
unsupported by CMake <= 2.8.10. Add manual search paths as a workaround.
Currently it is only needed for libsvn, but it is needed for any lib
which is converted to the new directory standard.
2012-12-01 11:01:25 +01:00
Thomas Geymayer
82884ab3c6 Improve finding gperftools and disable profiling by default (even with gperftools installed) 2012-11-19 13:11:03 +01:00
Thomas Geymayer
779a9ae415 Really make profiling commands optional 2012-11-15 13:56:31 +01:00
Thomas Geymayer
fe1222a90d Optional profiling commands using gperftools 2012-11-15 11:55:37 +01:00
ThorstenB
d94dd2013a #893: add missing docs for cmake build option. Thanks to koubiwan.
SIMGEAR_SHARED actually worked for FG, but the option wasn't visible in
cmake-gui.
2012-10-04 20:57:35 +02:00
ThorstenB
293d6b3565 Fix compilation with enabled EVENT_INPUT
Need to move the definition to the toplevel cmake file, since sources
are no longer compiled on directory level (individual libs per dir).
2012-09-22 14:23:15 +02:00
ThorstenB
acb7fb8e95 Fix shared library build with sqlite
Dependency to threading lib is required (It is already provided for
static SimGear).
2012-09-22 14:23:14 +02:00
James Turner
50c61b4211 Allow use of the system's SQLite3 library.
Keep distro packagers happy by having the option to use the system's sqlite library instead of our bundled version. Set SYSTEM_SQLITE=1 when running cmake to use the system one.
2012-09-19 14:28:25 +01:00