fly/flightgear
1
0
Fork 0
Code Activity

Add support for AeonWave

Browse source
This commit is contained in:
Erik Hofman 2016-07-06 13:27:14 +02:00
parent ffdf542871
commit 9ec4d7749f
19 changed files with 41 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
CMakeLists.txt
View file

@ -176,6 +176,7 @@ option(ENABLE_PROFILE "Set to ON to build FlightGear with gperftools profilin
option(SYSTEM_SQLITE "Set to ON to build FlightGear with the system's SQLite3 library" OFF)
option(ENABLE_IAX "Set to ON to build FlightGear with IAXClient/fgcom built-in (default)" ON)
option(USE_DBUS "Set to ON to build FlightGear with DBus screensaver interaction (default on Linux)" ${USE_DBUS_DEFAULT})
option(USE_AEONWAVE "Set to ON to use AeonWave instead of OpenAL" ON)
option(SYSTEM_SPEEX "Set to ON to build IAXClient with the system's speex and speexdsp library" ${SYSTEM_SPEEX_DEFAULT})
option(SYSTEM_GSM "Set to ON to build IAXClient with the system's GSM library" ${SYSTEM_GSM_DEFAULT})
option(SYSTEM_FLITE "Set to ON to build Flightgear with the system's Flite library" ${SYSTEM_FLITE_DEFAULT})
@ -384,11 +385,21 @@ include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
${OPENGL_INCLUDE_DIR}
${OPENAL_INCLUDE_DIR}
${SIMGEAR_INCLUDE_DIRS}
${PLIB_INCLUDE_DIR}
${SQLITE3_INCLUDED_DIR} )
if (USE_AEONWAVE)
find_package(AAX COMPONENTS aax REQUIRED)
include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS}
${AAX_INCLUDE_DIR}
)
else()
include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS}
${OPENAL_INCLUDE_DIR}
)
endif()
include_directories(${PROJECT_SOURCE_DIR})
include_directories(${PROJECT_SOURCE_DIR}/src)
# following is needed, because config.h is include 'bare', whereas

8
CMakeModules/ConfigureMsvc3rdParty.cmake
View file

@ -57,6 +57,10 @@ if (MSVC AND MSVC_3RDPARTY_ROOT)
${MSVC_3RDPARTY_ROOT}/boost_1_44_0
)
message(STATUS "BOOST_ROOT is ${BOOST_ROOT}")
set (OPENAL_INCLUDE_DIR ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/include)
set (OPENAL_LIBRARY_DIR ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib)
if (USE_AEONWAVE)
find_package(AAX COMPONENTS aax REQUIRED)
else()
set (OPENAL_INCLUDE_DIR ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/include)
set (OPENAL_LIBRARY_DIR ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib)
endif()
endif (MSVC AND MSVC_3RDPARTY_ROOT)

9
CMakeModules/FindSimGear.cmake
View file

@ -148,8 +148,13 @@ else(SIMGEAR_SHARED)
${ZLIB_LIBRARY}
${WINMM_LIBRARY})
set(SIMGEAR_SCENE_LIBRARY_DEPENDENCIES
${OPENAL_LIBRARY})
if (USE_AEONWAVE)
set(SIMGEAR_SCENE_LIBRARY_DEPENDENCIES
${AAX_LIBRARY})
else()
set(SIMGEAR_SCENE_LIBRARY_DEPENDENCIES
${OPENAL_LIBRARY})
endif()
if(APPLE)
find_library(COCOA_LIBRARY Cocoa)

2
src/Environment/fgclouds.cxx
View file

@ -31,7 +31,7 @@
#include <Main/fg_props.hxx>
#include <simgear/constants.h>
#include <simgear/sound/soundmgr_openal.hxx>
#include <simgear/sound/soundmgr.hxx>
#include <simgear/scene/sky/sky.hxx>
//#include <simgear/environment/visual_enviro.hxx>
#include <simgear/scene/sky/cloudfield.hxx>

2
src/Instrumentation/mk_viii.cxx
View file

@ -74,7 +74,7 @@
#include <simgear/math/SGLineSegment.hxx>
#include <simgear/math/SGIntersect.hxx>
#include <simgear/misc/sg_path.hxx>
#include <simgear/sound/soundmgr_openal.hxx>
#include <simgear/sound/soundmgr.hxx>
#include <simgear/sound/sample_group.hxx>
#include <simgear/structure/exception.hxx>

2
src/Instrumentation/tcas.cxx
View file

@ -100,7 +100,7 @@
#include <simgear/sg_inlines.h>
#include <simgear/debug/logstream.hxx>
#include <simgear/math/sg_geodesy.hxx>
#include <simgear/sound/soundmgr_openal.hxx>
#include <simgear/sound/soundmgr.hxx>
#include <simgear/sound/sample_group.hxx>
#include <simgear/structure/exception.hxx>

2
src/Main/fg_commands.cxx
View file

@ -22,7 +22,7 @@
#include <simgear/props/props.hxx>
#include <simgear/props/props_io.hxx>
#include <simgear/structure/event_mgr.hxx>
#include <simgear/sound/soundmgr_openal.hxx>
#include <simgear/sound/soundmgr.hxx>
#include <simgear/timing/sg_time.hxx>
#include <Network/RemoteXMLRequest.hxx>

2
src/Main/fg_props.cxx
View file

@ -31,7 +31,7 @@
#include <simgear/timing/sg_time.hxx>
#include <simgear/misc/sg_path.hxx>
#include <simgear/scene/model/particles.hxx>
#include <simgear/sound/soundmgr_openal.hxx>
#include <simgear/sound/soundmgr.hxx>
#include <GUI/gui.h>

2
src/Main/globals.cxx
View file

@ -38,7 +38,7 @@
#include <simgear/scene/material/matlib.hxx>
#include <simgear/structure/subsystem_mgr.hxx>
#include <simgear/structure/event_mgr.hxx>
#include <simgear/sound/soundmgr_openal.hxx>
#include <simgear/sound/soundmgr.hxx>
#include <simgear/misc/ResourceManager.hxx>
#include <simgear/props/propertyObject.hxx>
#include <simgear/props/props_io.hxx>

2
src/Main/options.cxx
View file

@ -48,7 +48,7 @@
#include <simgear/misc/sgstream.hxx>
#include <simgear/misc/sg_path.hxx>
#include <simgear/scene/material/mat.hxx>
#include <simgear/sound/soundmgr_openal.hxx>
#include <simgear/sound/soundmgr.hxx>
#include <simgear/misc/strutils.hxx>
#include <Autopilot/route_mgr.hxx>
#include <Aircraft/replay.hxx>

2
src/Sound/audioident.hxx
View file

@ -28,7 +28,7 @@
#endif
#include <string>
#include <simgear/sound/soundmgr_openal.hxx>
#include <simgear/sound/soundmgr.hxx>
class AudioIdent {
public:

2
src/Sound/beacon.hxx
View file

@ -27,7 +27,7 @@
#include "soundgenerator.hxx"
#include <simgear/compiler.h>
#include <simgear/sound/soundmgr_openal.hxx>
#include <simgear/sound/soundmgr.hxx>
#include <simgear/structure/SGReferenced.hxx>
#include <simgear/structure/SGSharedPtr.hxx>

2
src/Sound/fg_fx.cxx
View file

@ -37,7 +37,7 @@
#include <simgear/props/props.hxx>
#include <simgear/props/props_io.hxx>
#include <simgear/misc/sg_path.hxx>
#include <simgear/sound/soundmgr_openal.hxx>
#include <simgear/sound/soundmgr.hxx>
#include <simgear/sound/xmlsound.hxx>
FGFX::FGFX ( const std::string &refname, SGPropertyNode *props ) :

2
src/Sound/flitevoice.hxx
View file

@ -24,7 +24,7 @@
#define _FLITEVOICE_HXX
#include "voice.hxx"
#include <simgear/sound/soundmgr_openal.hxx>
#include <simgear/sound/soundmgr.hxx>
#include <simgear/sound/sample.hxx>
#include <simgear/threads/SGQueue.hxx>

2
src/Sound/morse.hxx
View file

@ -25,7 +25,7 @@
#include "soundgenerator.hxx"
#include <simgear/compiler.h>
#include <simgear/sound/soundmgr_openal.hxx>
#include <simgear/sound/soundmgr.hxx>
// Quoting from http://www.kluft.com/~ikluft/ham/morse-intro.html by

2
src/Sound/sample_queue.cxx
View file

@ -33,7 +33,7 @@
#include <Main/fg_props.hxx>
#include <simgear/sound/soundmgr_openal.hxx>
#include <simgear/sound/soundmgr.hxx>
#include <simgear/sound/sample.hxx>
FGSampleQueue::FGSampleQueue ( SGSoundMgr *smgr, const std::string &refname ) :

2
src/Sound/soundmanager.cxx
View file

@ -21,7 +21,7 @@
# include <config.h>
#endif
#include <simgear/sound/soundmgr_openal.hxx>
#include <simgear/sound/soundmgr.hxx>
#include <simgear/structure/commands.hxx>
#if defined(ENABLE_FLITE)

2
src/Sound/soundmanager.hxx
View file

@ -24,7 +24,7 @@
#include <map>
#include <simgear/props/props.hxx>
#include <simgear/structure/subsystem_mgr.hxx>
#include <simgear/sound/soundmgr_openal.hxx>
#include <simgear/sound/soundmgr.hxx>
class FGSampleQueue;
class SGSoundMgr;

2
src/Sound/voiceplayer.cxx
View file

@ -39,7 +39,7 @@
#include <sstream>
#include <simgear/debug/logstream.hxx>
#include <simgear/sound/soundmgr_openal.hxx>
#include <simgear/sound/soundmgr.hxx>
#include <simgear/sound/sample_group.hxx>
#include <simgear/structure/exception.hxx>