35 lines
1.5 KiB
Diff
35 lines
1.5 KiB
Diff
--- examples/Makefile.am.org 2010-04-14 22:11:30.868130523 +0100
|
|
+++ examples/Makefile.am 2010-04-14 22:20:08.230133173 +0100
|
|
@@ -8,19 +8,19 @@
|
|
if USE_FLTK
|
|
bin_PROGRAMS += mgl_fltk_example
|
|
mgl_fltk_example_SOURCES = wnd_samples.cpp fltk_example.cpp
|
|
-mgl_fltk_example_LDADD = $(FLTK_LIBS) $(top_builddir)/widgets/libmgl-fltk.la
|
|
+mgl_fltk_example_LDADD = $(FLTK_LIBS) $(top_builddir)/widgets/libmgl-fltk.la $(top_builddir)/mgl/libmgl.la
|
|
mgl_fltk_example_CXXFLAGS = $(FLTK_FLAGS) $(AM_CXXFLAGS)
|
|
|
|
check_PROGRAMS += test
|
|
test_SOURCES = wnd_samples.cpp main.cpp
|
|
-test_LDADD = $(FLTK_LIBS) $(top_builddir)/widgets/libmgl-fltk.la
|
|
+test_LDADD = $(FLTK_LIBS) $(top_builddir)/widgets/libmgl-fltk.la $(top_builddir)/mgl/libmgl.la
|
|
test_CXXFLAGS = $(FLTK_FLAGS) $(AM_CXXFLAGS)
|
|
endif
|
|
|
|
if USE_GLUT
|
|
bin_PROGRAMS += mgl_glut_example
|
|
mgl_glut_example_SOURCES = wnd_samples.cpp glut_example.cpp
|
|
-mgl_glut_example_LDADD = $(top_builddir)/widgets/libmgl-glut.la
|
|
+mgl_glut_example_LDADD = $(top_builddir)/widgets/libmgl-glut.la $(top_builddir)/mgl/libmgl.la
|
|
endif
|
|
|
|
if USE_WX
|
|
@@ -36,7 +36,7 @@
|
|
|
|
bin_PROGRAMS += mgl_qt_example
|
|
mgl_qt_example_SOURCES = wnd_samples.cpp $(top_builddir)/include/mgl/mgl_qt.moc.cpp $(top_srcdir)/include/mgl/mgl_qt.h qt_example.cpp
|
|
-mgl_qt_example_LDADD = $(QT_LIBS) $(top_builddir)/widgets/libmgl-qt.la
|
|
+mgl_qt_example_LDADD = $(QT_LIBS) $(top_builddir)/widgets/libmgl-qt.la $(top_builddir)/mgl/libmgl.la
|
|
mgl_qt_example_LDFLAGS = $(QT_LDFLAGS)
|
|
mgl_qt_example_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS)
|
|
mgl_qt_example_CXXFLAGS = $(QT_CXXFLAGS) $(AM_CXXFLAGS)
|