SERIAL_LIBS =
endif
-if ENABLE_OLD_WEATHER
-WEATHER_LIBS = $(top_builddir)/src/Weather/libWeather.a
-else
+if ENABLE_WEATHERCM
WEATHER_LIBS = $(top_builddir)/src/WeatherCM/libWeatherCM.a
+else
+WEATHER_LIBS = $(top_builddir)/src/Environment/libEnvironment.a
endif
if ENABLE_NETWORK_OLK
$(top_builddir)/src/Network/libNetwork.a
endif
-if OLD_AUTOMAKE
+if WITH_THREADS
+THREAD_LIBS = -lsgthreads
+else
+THREAD_LIBS =
+endif
+
+if ANCIENT_AUTOMAKE
# nothing CXXFLAGS += -DPKGLIBDIR=\"$(pkglibdir)\"
else
AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\"
bin_PROGRAMS = fgfs
-noinst_SCRIPTS = runfgfs runfgfs.bat
+noinst_SCRIPTS = runfgfs.bat runfgfs
-bin_SCRIPTS = runfgfs
+# bin_SCRIPTS = runfgfs
fgfs_SOURCES = \
main.cxx \
- bfi.cxx bfi.hxx \
+ fg_commands.cxx fg_commands.hxx \
fg_init.cxx fg_init.hxx \
fg_io.cxx fg_io.hxx \
+ fg_props.cxx fg_props.hxx \
+ fgfs.cxx fgfs.hxx \
globals.cxx globals.hxx \
- keyboard.cxx keyboard.hxx \
+ logger.cxx logger.hxx \
options.cxx options.hxx \
- save.cxx save.hxx \
splash.cxx splash.hxx \
viewer.cxx viewer.hxx \
- viewer_lookat.cxx viewer_lookat.hxx \
- viewer_rph.cxx viewer_rph.hxx \
- viewmgr.cxx viewmgr.hxx
+ viewmgr.cxx viewmgr.hxx \
+ location.cxx location.hxx
fgfs_LDADD = \
$(top_builddir)/src/Aircraft/libAircraft.a \
+ $(top_builddir)/src/ATC/libATC.a \
$(top_builddir)/src/Autopilot/libAutopilot.a \
$(top_builddir)/src/Cockpit/libCockpit.a \
+ $(top_builddir)/src/Cockpit/built_in/libBuilt_in.a \
$(top_builddir)/src/Controls/libControls.a \
$(top_builddir)/src/FDM/libFlight.a \
$(top_builddir)/src/FDM/Balloon/libBalloon.a \
$(top_builddir)/src/FDM/JSBSim/libJSBSim.a \
+ $(top_builddir)/src/FDM/YASim/libYASim.a \
$(top_builddir)/src/FDM/JSBSim/filtersjb/libfiltersjb.a \
$(top_builddir)/src/FDM/LaRCsim/libLaRCsim.a \
$(top_builddir)/src/FDM/UIUCModel/libUIUCModel.a \
$(top_builddir)/src/GUI/libGUI.a \
+ $(top_builddir)/src/Model/libModel.a \
$(top_builddir)/src/Navaids/libNavaids.a \
$(top_builddir)/src/Scenery/libScenery.a \
+ $(top_builddir)/src/Sound/libSound.a \
$(top_builddir)/src/Airports/libAirports.a \
$(NETWORK_LIBS) \
$(top_builddir)/src/Objects/libObjects.a \
$(top_builddir)/src/Time/libTime.a \
$(WEATHER_LIBS) \
- $(top_builddir)/src/Joystick/libJoystick.a \
- -lsgroute -lsgsky -lsgephem -lsgtiming -lsgio -lsgscreen -lsgmath \
- -lsgbucket -lsgdebug -lsgmagvar -lsgmisc -lsgxml \
+ $(top_builddir)/src/Input/libInput.a \
+ -lsgroute -lsgsky -lsgephem -lsgtiming -lsgio -lsgscreen \
+ -lsgmath -lsgbucket -lsgdebug -lsgmagvar -lsgmisc -lsgxml \
$(SERIAL_LIBS) \
- -lplibpu -lplibfnt -lplibssg -lplibsg \
+ $(THREAD_LIBS) \
+ -lplibpu -lplibfnt -lplibnet -lplibssg -lplibsg \
-lmk4 -lz \
$(opengl_LIBS) \
$(audio_LIBS)
+fgfs_CFLAGS = -DTHIS_IS_A_TEST
+
+if OLD_AUTOMAKE
INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
+else
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
+endif
+
+