Thomas Geymayer
fa64f7b6aa
Work around MSVC linker bug with classes derived from i/ofstream
2013-04-27 23:44:32 +02:00
Thomas Geymayer
eaac3a64f8
Fix linker error for test
2013-04-26 23:48:25 +02:00
Thomas Geymayer
e08eda18d5
CMake: Create list of libs for testing only once
2013-03-15 23:21:38 +01:00
PlutoniumHeart
870fc2e53e
Replacing strdup with _strdup in MSVC
2013-03-06 23:58:38 -07:00
James Turner
67efc1f68f
Look for MSVC 3rdparty deps differently.
...
Check for the 3rdparty dir in the parent of build dir, not the parent of the source dir. For the recommended build layout, this is the same location, but for super-builds using fgmeta it's not (and the source tree should not be touched).
If this causes anyone issues, please let me know, since it's possible more flexibility is needed to set the path explicitly.
2013-03-03 16:06:51 +00:00
James Turner
dfebf60e68
Simplify CMakeLists now package code is enabled.
2013-03-03 16:01:06 +00:00
James Turner
439041c2f4
Enable package code by default.
2013-03-02 14:43:19 +00:00
James Turner
06b089ba13
Updated package-management code.
...
Use mini-unzip code to extract, since we don't need all the features of libArchive, and the deployment issues become simpler.
2013-02-28 18:31:28 +00:00
James Turner
a530712491
Initial work on package management.
...
Basic library infrastructure, catalog download/refresh, and package install,
uninstall and update. Disabled at cmake time by default, and not yet hooked
into FlightGear.
2013-02-20 16:17:22 +00:00
James Turner
d11db8a67a
Prepare for optionally embedded SimGear.
2013-01-26 15:31:17 +01:00
James Turner
24d2431522
Work on making OpenAL a compile-time option.
...
ENABLE_SOUND=0 now works when configuring SimGear, and libSimGearScene can be linked without OpenAL. However, more testing of FlightGear in this mode is needed before it's officially supported!
2012-12-07 15:26:24 -05:00
ThorstenB
7d8fde82e6
Fixed incomplete copy&paste issue.
2012-12-01 11:07:10 +01:00
ThorstenB
99cf057906
#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:00:50 +01:00
Frederic Bouvier
59d3d66f91
Look for Boost 1.52.0 and OpenRTI under Windows
2012-12-01 10:59:58 +01:00
ThorstenB
e37232aeb4
Disable build options unsupported for Windows.
2012-11-08 20:01:38 +01:00
Thomas Geymayer
2d039e393a
Include ShivaVG into libSimGearScene
2012-11-04 20:00:53 +01:00
Thomas Geymayer
c6ce1d8c67
Fix adding ShivaVG include directory
2012-11-04 16:51:07 +01:00
James Turner
c188f6e3cb
Initial work on making OpenAL private to the sound code.
2012-10-04 16:47:13 +01:00
Mathias Froehlich
7bcf02a0b4
Handle isnan at a more central place.
...
Do not distribute architecture specific
code across a lot of places.
2012-09-27 18:44:14 +02:00
James Turner
ddbb2bea8a
Option to use system, instead of built-in, expat
...
At least one Linux distribution packager of FG has complained that we're bundling expat in our binaries. To keep them happy, add the option (-DSYSTEM_EXPAT=1 at cmake time) to use the system expat instead.
For the moment (and simplicity), this requires building SIMGEAR_SHARED (which is fired to on by selecting the option).
2012-09-16 17:07:35 +01:00
Frederic Bouvier
9dd5b91cea
Support MS VS2012
2012-09-03 17:32:26 +02:00
Frederic Bouvier
b4c8b00c0e
Try to discover the most recent Boost version installed in MSVC_ROOT (Windows only)
2012-09-02 12:43:21 +02:00
James Turner
c4f6aa2f90
Remove ALUT usage from SimGear .
...
Adapt the freealut code into a WAV-file reader. As a side-effect, it would now be possible to deploy WAV files compressed with gzip, since we use ZLib's gzread functions to read from disk.
2012-08-21 13:24:35 +01:00
James Turner
3270edcf87
Mac changes for Subversion bundling.
2012-08-11 15:21:52 +01:00
Tim Moore
d6361dfee4
Merge branch 'timoore/optimizations' into next
2012-08-03 22:33:57 +02:00
Tim Moore
b61692b667
add libosgGA to OpenSceneGraph libraries used with tests
...
The DeletionManager needs osgGA. This becomes apparent when building shared
libraries.
2012-08-03 22:32:39 +02:00
ThorstenB
d0a5032723
Add warning for in-source-directory builds.
2012-07-17 19:18:05 +02:00
ThorstenB
a781eea10e
#744 : Raise warning level when reporting missing svn library.
...
Status message are almost invisible - use warning message instead, so
builders/packagers actually notice a missing dependency.
Also add some useful hints.
2012-06-24 20:04:26 +02:00
ThorstenB
6129de31f0
Fix C compiler warning.
...
"no-overloaded-virtual" warnings are a CXX-compiler feature
2012-05-05 09:46:11 +02:00
James Turner
56661afc05
Change how HAVE_EXPAT_CONFIG_H is defined, to hopefully fix MSVC properly.
2012-05-04 10:10:46 +01:00
James Turner
65aca6607e
Update to latest expat for improved BOM / encoding handling.
...
(Related to http://code.google.com/p/flightgear-bugs/issues/detail?id=635 )
2012-05-03 17:29:16 +01:00
James Goppert
619163d40e
Fixed mingw build.
2012-03-16 23:04:24 +01:00
Mathias Froehlich
8c78588ee1
Untangle osg singleton dependencies.
...
Take two. The ModelRegistry's are already derived from osg::Referenced.
So also introduce the osg dependent version in simgear/scene/util.
2012-03-03 18:57:48 +01:00
Mathias Froehlich
c74e212494
Revert "Use simgear internal stuff for the singleton class."
...
This reverts commit 80274596df
.
2012-03-03 18:21:49 +01:00
Mathias Froehlich
80274596df
Use simgear internal stuff for the singleton class.
...
This removes the other still present dependency on osg
in the future sgcore library.
It also remove the need for the NO_OPENSCENEGRAPH_INTERFACE
compile time definition.
2012-03-03 14:39:39 +01:00
ThorstenB
811147d08e
Fix string comparison
2012-02-28 08:39:19 +01:00
ThorstenB
4bf4091ef7
Remove obsolete comment...
2012-02-24 22:47:18 +01:00
ThorstenB
b7fa1d4f02
#537 linker issues due to clock_gettime/librt dependencies
...
Simplify dependency check and make it work for Debian.
2012-02-24 22:20:37 +01:00
Olaf Flebbe
1af8aacd1d
disable annoying clang warning
2012-02-10 22:42:27 +01:00
ThorstenB
f97ced2240
Add version suffix when building shared objects
2011-12-29 14:45:29 +01:00
ThorstenB
7a52c2fa71
cmake: add option to disable building tests
2011-11-26 16:39:40 +01:00
ThorstenB
ec5d067d28
CMake: Proper support for lib vs lib64 installation
...
Determine name of library installation directory, i.e. "lib" vs "lib64",
which differs between all Debian-based vs all other Linux distros.
See cmake bug #11964 , http://cmake.org/gitweb?p=cmake.git;a=commit;h=126c993d
Also provide a script for older (<=2.8.4) cmake
2011-11-25 12:06:54 +01:00
Mathias Froehlich
ad079b8ed4
modellib: Add method for deferred model loading.
...
Add method that schedules a ProxyNode to do
just deferred model loading instead of full scenery paging.
Add support for ProxyNodes to CheckSceneryVisitor.
Use PagedLOD instead of our own derived method.
2011-11-08 21:31:18 +01:00
James Turner
a31639682b
Use a compile test to see if we need to provide the GCC atomic built-ins ourselves, or not.
2011-10-23 15:59:27 +01:00
James Turner
5eec2e7889
Support for creating a source package via CPack
2011-10-22 15:37:17 +01:00
James Turner
04a47dfb8d
Use mkdtemp where available, avoiding linker warnings about dangerous tempnam
2011-10-15 02:06:35 +01:00
Martin Spott
3849de1931
Merge branch 'next' of git.gitorious.org:fg/simgear into next
2011-09-26 16:23:58 +02:00
James Turner
a459b8fdbb
Make the common case the default: no library suffix for RelWithDbg or MinSizeRel builds. Of course you can still specify a suffix if desired.
2011-09-26 13:32:34 +01:00
Martin Spott
ecff995e7c
Merge branch 'next' of git.gitorious.org:fg/simgear into next
2011-09-12 16:02:00 +02:00
Frederic Bouvier
cad21935d6
Auto detect 3rd Party root for Windows
2011-09-12 10:53:18 +02:00
Martin Spott
40dc9ff95e
Merge branch 'next' of git.gitorious.org:fg/simgear into next
2011-09-12 09:30:27 +02:00
Mathias Froehlich
d290fdfc5f
cmake: Use a default build type that builds fast executables.
2011-09-12 08:10:20 +02:00
Martin Spott
24a421c83e
Merge branch 'next' of git.gitorious.org:fg/simgear into next
2011-09-12 00:57:50 +02:00
Frederic Bouvier
2f6b84a2cc
Lower the requirements on Cmake version (at least until Jenkins is updated)
2011-09-11 21:43:54 +02:00
Frederic Bouvier
2c00a4ac35
Enforce the use of Cmake 2.8
2011-09-11 20:48:50 +02:00
Martin Spott
1b1068248d
Merge branch 'next' of git.gitorious.org:fg/simgear into next
2011-09-08 11:48:56 +02:00
James Turner
b0015ab6e8
Further Windows Cmake tweaks.
2011-09-07 20:41:55 +01:00
James Turner
3a210d6fa6
Make sgio tests friendly to Windows.
2011-09-07 20:12:35 +01:00
James Turner
b5a4a55370
Cmake Windows tweaks.
2011-09-07 19:58:26 +01:00
Martin Spott
747717e2ee
Merge branch 'next' of git.gitorious.org:fg/simgear into next
2011-09-07 18:35:40 +02:00
James Turner
1305e16425
Work (in progress) on CPack packaging for SimGear
2011-09-07 16:54:28 +01:00
Martin Spott
b159a72ce9
Fix CMake HLA fix
2011-09-05 18:45:33 +02:00
Christian Schmitt
b317520543
Make RTI configurable
2011-08-24 13:25:46 +02:00
Christian Schmitt
25c3881782
fix some of the CMake syntax and correctly print the headless option
2011-08-24 13:23:46 +02:00
ThorstenB
469c0242d4
Improved CMake support for libsvn
...
Added missing CMake defines for SVN_CLIENT.
Don't detect libsvn without APR.
When installed, enable libsvn support by default (same as for automake).
When enabled, provide libsvn include dir to libtsync.
gitignore temporary CMake files
2011-08-04 19:28:13 +02:00
James Turner
4a65a23706
test linkage needs librt on Linux. Need to tidy this up on the FG side.
2011-07-19 13:53:13 +01:00
James Turner
f06f25532c
Tiny HTTP client layer on top of NetChat - and CTest support for some SimGear tests.
2011-07-19 12:55:55 +01:00
ThorstenB
0fd7bb8d3f
Convert terrasync into a subsystem.
...
Fixed scenery tile refresh method.
Simgear automake makefiles with libsvn detection.
Simgear CMake support for libsvn (may not work :) )
2011-06-11 23:22:26 +02:00
James Turner
5181aecc7b
Port version-defined-in-a-file logic over from fg.
2011-05-21 14:56:10 +01:00
James Turner
0e92cfbd0d
Bump Simgear version to 2.3.0 - should have been done after 2.2.0 was branched, oops. Will refactor this lot to use a single 'version' file like FG, soon.
2011-05-21 14:12:31 +01:00
Frederic Bouvier
57fa022c9f
Cmake: fix non MSVC build
2011-01-28 14:51:15 +01:00
Frederic Bouvier
76c3f7bc8f
Cmake: support VS2010 and MSVC 64 bit
2011-01-28 14:46:05 +01:00
Mathias Froehlich
d14fe813a9
Add the hla directory to the cmake build system.
2011-01-17 21:34:00 +01:00
James Turner
7d544dee47
Olaf Flebbe: Decrease required OSG version.
2011-01-13 22:14:37 +00:00
James Turner
fa3389ed23
Better MSVC Boost serialization fix from Olaf
2011-01-03 09:48:31 +00:00
Frederic Bouvier
188a84a893
Cmake: use build postfix
2011-01-02 19:44:04 +01:00
Frederic Bouvier
ceff1622c1
Cmake: Right way to search for include files
2011-01-02 18:45:14 +01:00
Frederic Bouvier
8d15cacf92
Cmake: MSVC_3RDPARTY_DIR is a path, not an option
2011-01-02 18:01:57 +01:00
James Turner
80161bfa96
Cmake: 3RDPARTY_DIR fixes from Olaf Flebbe
2011-01-01 21:06:43 +00:00
James Turner
07d3d6508a
Uninstall support, pinched from OSG.
2010-12-28 13:38:05 +00:00
James Turner
e4a8896fdc
MSVC improvements from Olaf Flebbe.
2010-12-28 13:32:54 +00:00
James Turner
b9a34b1b05
Initial work on CMake support for SimGear.
2010-12-19 14:16:39 +00:00