fly/flightgear
1
0
Fork 0
Code Activity

Merge branch 'next' of D:\Git_New\flightgear into next

Browse source
This commit is contained in:
Vivian Meazza 2010-11-01 18:23:23 +00:00
commit 830c2ae7db
4 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
configure.ac
View file

@ -23,6 +23,10 @@ AC_PROG_INSTALL
AC_PROG_LN_S
AX_BOOST_BASE([1.37.0])
# Show all compiler warnings by default
CXXFLAGS="$CXXFLAGS -Wall"
CFLAGS="$CFLAGS -Wall"
if test "x$BOOST_CPPFLAGS" != "x-I/usr/include" ; then
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
fi
@ -88,7 +92,7 @@ case "${host}" in
])
# Mac OS X specific configure options
AC_ARG_WITH(cocoa_framework, [ --with-cocoa-framework Use the Cocoa rather than Carbon]])
AC_ARG_WITH(cocoa_framework, [ --with-cocoa-framework Use the Cocoa rather than Carbon])
if test "x$with_cocoa_framework" != "x" ; then
macAPI=Cocoa
AC_MSG_NOTICE([Using Cocoa framework])
@ -179,7 +183,7 @@ AM_CONDITIONAL(ENABLE_SP_FDM, test "x$enable_sp_fdms" != "xno")
# Specify whether we want to compile ATCDCL.
# default to with_atcdcl=yes
AC_ARG_ENABLE(atcdcl, [ --enable-atcdcl Compile and link the depricated atc/ai module], [], [enable_atcdcl="$enableval"] )
AC_ARG_ENABLE(atcdcl, [ --enable-atcdcl Compile and link the deprecated atc/ai module], [], [enable_atcdcl="$enableval"] )
if test "x$enable_atcdcl" = "xyes"; then
AC_DEFINE([ENABLE_ATCDCL], 1, [Define to include old ATC/AI module])
else
@ -187,8 +191,6 @@ else
fi
AM_CONDITIONAL(ENABLE_ATCDCL, test "x$enable_atcdcl" = "xyes")
dnl EXPERIMENTAL generic event driven input device
# defaults to no
AC_ARG_WITH(eventinput, [ --with-eventinput Include event driven input (EXPERIMENTAL) [default=no]], [], [with_eventinput=no])
@ -231,7 +233,6 @@ if test "x$with_threads" = "xyes"; then
fi
AC_CHECK_HEADER(pthread.h)
dnl Used by JSBSim to conditionally compile in fgfs interface code
AC_DEFINE([FGFS], 1, [Define so that JSBSim compiles in 'library' mode])
@ -913,3 +914,4 @@ if test "x$enable_atcdcl" = "xyes"; then
else
echo "Build depricated ATC/AI module: no"
fi

5
src/Input/FGCommonInput.hxx
View file

@ -27,10 +27,11 @@
#include <vector>
#include <simgear/structure/SGBinding.hxx>
#include <simgear/compiler.h>
#if defined( UL_WIN32 )
#if defined( SG_WINDOWS )
#define TGT_PLATFORM "windows"
#elif defined ( UL_MAC_OSX )
#elif defined ( SG_MAC )
#define TGT_PLATFORM "mac"
#else
#define TGT_PLATFORM "unix"

7
src/Input/input.cxx
View file

@ -27,16 +27,19 @@
#endif
#include "input.hxx"
#include <simgear/compiler.h>
#include "FGMouseInput.hxx"
#include "FGKeyboardInput.hxx"
#include "FGJoystickInput.hxx"
#ifdef WITH_EVENTINPUT
#if defined( UL_WIN32 )
#if defined( SG_WINDOWS )
//to be developed
//#include "FGDirectXEventInput.hxx"
//#define INPUTEVENT_CLASS FGDirectXEventInput
#elif defined ( UL_MAC_OSX )
#elif defined ( SG_MAC )
#include "FGMacOSXEventInput.hxx"
#define INPUTEVENT_CLASS FGMacOSXEventInput
#else

2
src/Main/globals.cxx
View file

@ -167,8 +167,10 @@ FGGlobals::~FGGlobals()
// shut down all subsystems, make sure we take down the
// AIModels system first.
SGSubsystem* ai = subsystem_mgr->remove("ai_model");
if (ai) {
ai->unbind();
delete ai;
}
subsystem_mgr->unbind();
delete subsystem_mgr;