1
0
Fork 0
Commit graph

119 commits

Author SHA1 Message Date
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
Frederic Bouvier
bceb942ffa Support MS VS2012 2012-09-03 17:34:01 +02:00
ThorstenB
7a0db802d2 Improve error message when SimGear headers are missing/incomplete.
Also avoid CMake errors when files are missing.
2012-08-26 15:28:51 +02:00
James Turner
c06ab52c55 KIll off ALUT now it's gone from SimGear 2012-08-22 00:10:00 +01:00
ThorstenB
59fe04f8e9 Make web browser app configurable through CMake (for Linux)
so package builders don't need local patches.
Also, instead of hardcoded firefox, use "xdg-open" or "sensible-browser"
launchers on Linux, to auto-detect user's preferred browser.
Override with cmake switch -DWEB_BROWSER=...
(Not affecting Mac/Win which are hard-coded anyway).
2012-08-18 14:11:31 +02:00
ThorstenB
9c87aeb1fc Add cmake Linux distro detection. 2012-08-18 13:40:57 +02:00
ThorstenB
c15af10a7d CMakeList clean-up.
Split into modules for readability.
2012-08-18 13:40:08 +02:00
ThorstenB
f563bea192 Add warning for in-source-directory builds. 2012-07-17 19:19:17 +02:00
James Turner
77cd7b39f7 Since we require OSG 3.0 now, this check is obsolete. 2012-05-15 23:10:53 +01:00
Frederic Bouvier
acadbdeee1 Avoid the dependency on Boost serialization library 2012-05-12 17:20:28 +02:00
Frederic Bouvier
6b008126b5 Begin to implement configurable rendering pipeline 2012-05-12 13:45:31 +02:00
ThorstenB
3d45a2e5a2 Fix C compiler warning.
"no-overloaded-virtual" warnings are a CXX-compiler feature
2012-05-05 09:42:25 +02:00
ThorstenB
73d2d3425f Don't install fg/READMEs
which only contain *build instructions* - so they are not useful *after*
installing binaries. User documentation (which should be installed) is in
fgdata/Docs.
2012-04-22 13:46:06 +02:00
ThorstenB
efa18fae1e Add CMake option to disable building test applications. 2012-04-08 18:49:11 +02:00
James Turner
54d026e64f Suppress a warning when using Clang. 2012-03-25 18:46:50 +01:00
ThorstenB
60ffb950e2 Consistent white-spacing... 2012-03-12 21:18:37 +01:00
ThorstenB
f453523b67 #706: Properly set FLTK include directory. 2012-03-12 21:15:05 +01:00