Merge branch 'jmt/gps' into next

[flightgear.git] / src / GUI / Makefile.am

diff --git a/src/GUI/Makefile.am b/src/GUI/Makefile.am
index e6979c0b7830a731bb779e818408da0b02959986..03792dcfcecb6927272d6178be7028fbbe4d99b4 100644 (file)
--- a/src/GUI/Makefile.am
+++ b/src/GUI/Makefile.am
@@ -1,25 +1,38 @@
 noinst_LIBRARIES = libGUI.a
 noinst_PROGRAMS = layout-test
 
+if HAVE_FRAMEWORK_PLIB
+layout_test_PLIB_FW = $(plib_FRAMEWORK)
+else
+layout_test_PLIB_LIBS = -lplibpw -lplibpu -lplibfnt -lplibul
+endif
+
+if HAVE_FRAMEWORK_OSG
+layout_test_OSG_LIBS = $(openthreads_FRAMEWORK)
+else
+layout_test_OSG_LIBS = $(openthreads_LIBS)
+endif
+
 libGUI_a_SOURCES = \
         new_gui.cxx new_gui.hxx \
         dialog.cxx dialog.hxx \
-       menubar.cxx menubar.hxx \
-       gui.cxx gui.h gui_funcs.cxx \
-       gui_local.cxx gui_local.hxx \
-       mouse.cxx \
-       preset_dlg.cxx preset_dlg.hxx \
-       prop_picker.cxx prop_picker.hxx \
-       sgVec3Slider.cxx sgVec3Slider.hxx \
-       trackball.c trackball.h \
-       puList.cxx puList.hxx \
-       AirportList.cxx AirportList.hxx \
-        layout.cxx layout-props.cxx layout.hxx
-
+        menubar.cxx menubar.hxx \
+        gui.cxx gui.h gui_funcs.cxx \
+        fonts.cxx \
+        AirportList.cxx AirportList.hxx \
+        property_list.cxx property_list.hxx \
+        layout.cxx layout-props.cxx layout.hxx \
+        SafeTexFont.cxx SafeTexFont.hxx \
+        WaypointList.cxx WaypointList.hxx \
+        MapWidget.cxx MapWidget.hxx
+        
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
 
 layout_test_SOURCES = layout-test.cxx
 
 layout_test_LDADD = libGUI.a \
-                    -lsgprops -lsgdebug -lsgstructure -lsgmisc -lsgxml \
-                    -lplibpw -lplibpu -lplibfnt -lplibul $(opengl_LIBS)
\ No newline at end of file
+                    -lsgprops -lsgdebug -lsgstructure -lsgmisc -lsgxml -lsgtiming \
+                    $(layout_test_PLIB_LIBS) $(opengl_LIBS)
+
+# mainly for Macs
+layout_test_LDFLAGS = $(layout_test_PLIB_FW) $(layout_test_OSG_LIBS)