Tweaks.

diff --git a/FlightGear.dsp b/FlightGear.dsp
index e658ec97397071984e098859c00c256d4049698c..2abb5f8f6f45afb415e6fe0608f86e783bdaca29 100644 (file)
--- a/FlightGear.dsp
+++ b/FlightGear.dsp
@@ -1956,6 +1956,21 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_wrapper.cpp
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
+SOURCE=.\src\FDM\ADA.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Flight"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Flight"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\src\FDM\Balloon.cxx\r
 \r
 !IF  "$(CFG)" == "FlightGear - Win32 Release"\r

diff --git a/src/Joystick/Makefile.am b/src/Joystick/Makefile.am
index ddbcecbf83c094f7f34d218e5805ed6c3447bc52..0a513f17c8c1b9eab75c7d9aaaa1f73a7a3e3a86 100644 (file)
--- a/src/Joystick/Makefile.am
+++ b/src/Joystick/Makefile.am
@@ -6,4 +6,6 @@ noinst_PROGRAMS = js_demo
 
 js_demo_SOURCES = js_demo.cxx
 
+js_demo_LDADD = $(audio_LIBS)
+
 INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 630afbe8345be6e9d3d7ba51b50cd2ae2027cd89..2d2fa302f3ed4ef3faf0c9453d893f4d226940a0 100644 (file)
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -103,9 +103,6 @@ FG_USING_STD(string);
 
 extern const char *default_root;
 
-// from main.cxx
-extern void fgReshape( int width, int height );
-
 
 // Read in configuration (file and command line) and just set fg_root
 bool fgInitFGRoot ( int argc, char **argv ) {