if ENABLE_UNIX_SERIAL
-SERIAL_LIBS = $(top_builddir)/Lib/Serial/libSerial.a
+SERIAL_LIBS = -lsgserial
else
SERIAL_LIBS =
endif
if ENABLE_OLD_WEATHER
-WEATHER_LIBS = $(top_builddir)/Simulator/Weather/libWeather.a
+WEATHER_LIBS = $(top_builddir)/src/Weather/libWeather.a
else
-WEATHER_LIBS = $(top_builddir)/Simulator/WeatherCM/libWeatherCM.a
+WEATHER_LIBS = $(top_builddir)/src/WeatherCM/libWeatherCM.a
endif
if ENABLE_NETWORK_OLK
NETWORK_LIBS = \
- $(top_builddir)/Simulator/Network/libNetwork.a \
- $(top_builddir)/Simulator/NetworkOLK/libNetworkOLK.a
+ $(top_builddir)/src/Network/libNetwork.a \
+ $(top_builddir)/src/NetworkOLK/libNetworkOLK.a
else
NETWORK_LIBS = \
- $(top_builddir)/Simulator/Network/libNetwork.a
+ $(top_builddir)/src/Network/libNetwork.a
+endif
+
+if WITH_THREADS
+THREAD_LIBS = -lsgthreads
+else
+THREAD_LIBS =
endif
if OLD_AUTOMAKE
-CXXFLAGS += -DPKGLIBDIR=\"$(pkglibdir)\"
+# nothing CXXFLAGS += -DPKGLIBDIR=\"$(pkglibdir)\"
else
AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\"
endif
bin_PROGRAMS = fgfs
-bin_SCRIPTS = runfgfs runfgfs.bat
+noinst_SCRIPTS = runfgfs.bat runfgfs
+
+# bin_SCRIPTS = runfgfs
fgfs_SOURCES = \
+ main.cxx \
+ fg_commands.cxx fg_commands.hxx \
fg_init.cxx fg_init.hxx \
fg_io.cxx fg_io.hxx \
- keyboard.cxx keyboard.hxx \
- main.cxx \
+ fg_props.cxx fg_props.hxx \
+ fgfs.cxx fgfs.hxx \
+ globals.cxx globals.hxx \
options.cxx options.hxx \
- save.cxx save.hxx \
splash.cxx splash.hxx \
- views.cxx views.hxx
-
-# fg_serial.cxx fg_serial.hxx \
+ viewer.cxx viewer.hxx \
+ viewer_lookat.cxx viewer_lookat.hxx \
+ viewer_rph.cxx viewer_rph.hxx \
+ viewmgr.cxx viewmgr.hxx
fgfs_LDADD = \
- $(top_builddir)/Simulator/Aircraft/libAircraft.a \
- $(top_builddir)/Simulator/Astro/libAstro.a \
- $(top_builddir)/Simulator/Autopilot/libAutopilot.a \
- $(top_builddir)/Simulator/Cockpit/libCockpit.a \
- $(top_builddir)/Simulator/Controls/libControls.a \
- $(top_builddir)/Simulator/FDM/libFlight.a \
- $(top_builddir)/Simulator/FDM/Balloon/libBalloon.a \
- $(top_builddir)/Simulator/FDM/JSBsim/libJSBsim.a \
- $(top_builddir)/Simulator/FDM/LaRCsim/libLaRCsim.a \
- $(top_builddir)/Simulator/GUI/libGUI.a \
- $(top_builddir)/Simulator/Scenery/libScenery.a \
- $(top_builddir)/Simulator/Airports/libAirports.a \
+ $(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/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/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/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)/Simulator/Objects/libObjects.a \
- $(top_builddir)/Simulator/Clouds/libClouds.a \
- $(top_builddir)/Simulator/Time/libTime.a \
+ $(top_builddir)/src/Objects/libObjects.a \
+ $(top_builddir)/src/Time/libTime.a \
$(WEATHER_LIBS) \
- $(top_builddir)/Simulator/Joystick/libJoystick.a \
+ $(top_builddir)/src/Input/libInput.a \
+ -lsgroute -lsgsky -lsgephem -lsgtiming -lsgio -lsgscreen \
+ -lsgmath -lsgbucket -lsgdebug -lsgmagvar -lsgmisc -lsgxml \
$(SERIAL_LIBS) \
- $(top_builddir)/Lib/Screen/libScreen.a \
- $(top_builddir)/Lib/Math/libMath.a \
- $(top_builddir)/Lib/Bucket/libBucket.a \
- $(top_builddir)/Lib/Debug/libDebug.a \
- -lplibpu -lplibfnt -lplibssg -lplibsg \
- $(top_builddir)/Lib/Misc/libMisc.a \
- $(top_builddir)/Lib/zlib/libz.a \
+ $(THREAD_LIBS) \
+ -lplibpu -lplibfnt -lplibnet -lplibssg -lplibsg \
+ -lmk4 -lz \
$(opengl_LIBS) \
$(audio_LIBS)
-
-INCLUDES += \
- -I$(top_builddir) \
- -I$(top_builddir)/Lib \
- -I$(top_builddir)/Simulator
+INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src