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

configure.ac

@@ -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])
 
@@ -314,7 +315,7 @@ AC_SEARCH_LIBS(clock_gettime, rt)
 base_LIBS="$LIBS"
 
 dnl Check for SDL or glut if enabled.
-AC_ARG_ENABLE(osgviewer, [  --enable-osgviewer             Configure to use osgViewer(default)], [enable_osgviewer="$enableval"])
+AC_ARG_ENABLE(osgviewer, [  --enable-osgviewer             Configure to use osgViewer (default)], [enable_osgviewer="$enableval"])
 AC_ARG_ENABLE(sdl,  [  --enable-sdl                   Configure to use SDL], [enable_sdl="$enableval"])
 AC_ARG_ENABLE(glut, [  --enable-glut                  Configure to use GLUT], [enable_glut="$enableval"])
 AM_CONDITIONAL(USE_SDL, test "x$enable_sdl" = "xyes")
@@ -913,3 +914,4 @@ if test "x$enable_atcdcl" = "xyes"; then
 else
     echo "Build depricated ATC/AI module: no"
 fi
+

src/Input/FGCommonInput.hxx

@@ -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"

src/Input/input.cxx

@@ -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

src/Main/globals.cxx

@@ -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;