From c67e0467b47d7471b42dda850141f4ef035040b5 Mon Sep 17 00:00:00 2001 From: curt Date: Mon, 23 Oct 2000 20:27:41 +0000 Subject: [PATCH] Tweaks. --- FlightGear.dsp | 15 +++++++++++++++ src/Joystick/Makefile.am | 2 ++ src/Main/fg_init.cxx | 3 --- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/FlightGear.dsp b/FlightGear.dsp index e658ec973..2abb5f8f6 100644 --- a/FlightGear.dsp +++ b/FlightGear.dsp @@ -1956,6 +1956,21 @@ SOURCE=.\src\FDM\UIUCModel\uiuc_wrapper.cpp # PROP Default_Filter "" # Begin Source File +SOURCE=.\src\FDM\ADA.cxx + +!IF "$(CFG)" == "FlightGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_Flight" + +!ELSEIF "$(CFG)" == "FlightGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_Flight" + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\src\FDM\Balloon.cxx !IF "$(CFG)" == "FlightGear - Win32 Release" diff --git a/src/Joystick/Makefile.am b/src/Joystick/Makefile.am index ddbcecbf8..0a513f17c 100644 --- 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 630afbe83..2d2fa302f 100644 --- 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 ) { -- 2.39.5