diff options
| -rw-r--r-- | plugin/Makefile.am | 14 | ||||
| -rw-r--r-- | plugingui/Makefile.am | 88 | ||||
| -rw-r--r-- | test/Makefile.am | 26 |
3 files changed, 97 insertions, 31 deletions
diff --git a/plugin/Makefile.am b/plugin/Makefile.am index 38c5c4f..c6c9f1a 100644 --- a/plugin/Makefile.am +++ b/plugin/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = vst -include $(top_srcdir)/plugingui/Makefile.am.plugingui +#include $(top_srcdir)/plugingui/Makefile.am.plugingui include $(top_srcdir)/src/Makefile.am.drumgizmo @@ -15,17 +15,17 @@ endif drumgizmo_la_CXXFLAGS = -DLV2 -DLV2_PLUGIN_URI=\"http://drumgizmo.org/lv2\" \ -I$(top_srcdir)/plugin/plugingizmo $(DRUMGIZMO_CPPFLAGS) \ - $(PLUGIN_GUI_CPPFLAGS) + -I$(top_srcdir)/plugingui drumgizmo_la_SOURCES = \ $(DRUMGIZMO_SOURCES) \ - $(PLUGIN_GUI_SOURCES) \ $(top_srcdir)/plugin/plugingizmo/midievent.cc \ $(top_srcdir)/plugin/plugingizmo/pluginlv2.cc \ drumgizmo_plugin.cc drumgizmo_la_LDFLAGS = -shared -module -avoid-version -drumgizmo_la_LIBADD = $(LV2_LIBS) $(PLUGIN_GUI_LIBS) $(DRUMGIZMO_LIBS) +drumgizmo_la_LIBADD = $(LV2_LIBS) $(DRUMGIZMO_LIBS) \ + $(top_srcdir)/plugingui/libdggui.la ####### @@ -39,17 +39,17 @@ endif drumgizmo_vst_la_CXXFLAGS = -DVST \ -I$(top_srcdir)/plugin/plugingizmo $(DRUMGIZMO_CPPFLAGS) \ - $(PLUGIN_GUI_CPPFLAGS) $(VST_CPPFLAGS) -Ivst + $(VST_CPPFLAGS) -Ivst -I$(top_srcdir)/plugingui drumgizmo_vst_la_SOURCES = \ $(DRUMGIZMO_SOURCES) \ - $(PLUGIN_GUI_SOURCES) \ $(top_srcdir)/plugin/plugingizmo/midievent.cc \ $(top_srcdir)/plugin/plugingizmo/pluginvst.cc \ drumgizmo_plugin.cc drumgizmo_vst_la_LDFLAGS = -shared -module -avoid-version -drumgizmo_vst_la_LIBADD = vst/libvstsdk.la $(PLUGIN_GUI_LIBS) $(DRUMGIZMO_LIBS) +drumgizmo_vst_la_LIBADD = vst/libvstsdk.la $(DRUMGIZMO_LIBS) \ + $(top_srcdir)/plugingui/libdggui.la install-exec-hook: diff --git a/plugingui/Makefile.am b/plugingui/Makefile.am index 49025c7..e67b9f6 100644 --- a/plugingui/Makefile.am +++ b/plugingui/Makefile.am @@ -1,8 +1,91 @@ noinst_PROGRAMS = plugingui rcgen +noinst_LTLIBRARIES = libdggui.la -include Makefile.am.plugingui +#include Makefile.am.plugingui -plugingui_LDADD = $(PLUGIN_GUI_LIBS) +resource_data.cc : rcgen + (cd resources; ../rcgen * > ../resource_data.cc) + +PLUGIN_GUI_LIBS = $(GUI_LIBS) $(PTHREAD_LIBS) + +PLUGIN_GUI_CPPFLAGS = \ + $(GUI_CPPFLAGS) -I$(top_srcdir)/hugin \ + -I$(top_srcdir)/plugingui \ + -DWITH_HUG_MUTEX $(PTHREAD_CFLAGS) \ + -DLODEPNG_NO_COMPILE_ENCODER \ + -DLODEPNG_NO_COMPILE_DISK \ + -DLODEPNG_NO_COMPILE_ANCILLARY_CHUNKS \ + -DLODEPNG_NO_COMPILE_ERROR_TEXT \ + -DLODEPNG_NO_COMPILE_CPP + +libdggui_la_CPPFLAGS = $(PLUGIN_GUI_CPPFLAGS) -I../src +libdggui_la_LIBADD = $(PLUGIN_GUI_LIBS) +nodist_libdggui_la_SOURCES = \ + $(top_srcdir)/hugin/hugin.c \ + dgwindow.cc \ + plugingui.cc \ + label.cc \ + eventhandler.cc \ + font.cc \ + window.cc \ + widget.cc \ + colour.cc \ + painter.cc \ + button.cc \ + pixelbuffer.cc \ + lineedit.cc \ + led.cc \ + checkbox.cc \ + mainwindow.cc \ + slider.cc \ + scrollbar.cc \ + stackedwidget.cc \ + tabbutton.cc \ + tabwidget.cc \ + textedit.cc \ + texture.cc \ + texturedbox.cc \ + layout.cc \ + listbox.cc \ + listboxthin.cc \ + listboxbasic.cc \ + knob.cc \ + filebrowser.cc \ + directory.cc \ + pluginconfig.cc \ + imagecache.cc \ + image.cc \ + combobox.cc \ + progressbar.cc \ + verticalline.cc \ + resource.cc \ + resource_data.cc \ + lodepng/lodepng.cpp + +if ENABLE_X11 +nodist_libdggui_la_SOURCES += \ + nativewindow_x11.cc +endif + +if ENABLE_WIN32 +nodist_libdggui_la_SOURCES += \ + nativewindow_win32.cc +endif + +if ENABLE_PUGL +nodist_libdggui_la_SOURCES += \ + nativewindow_pugl.cc \ + $(top_srcdir)/pugl/pugl/pugl_x11.c +PLUGIN_GUI_CPPFLAGS += -I$(top_srcdir)/pugl/pugl +endif + +#if ENABLE_COCOA +#nodist_libdggui_la_SOURCES += \ +# nativewindow_cocoa.m \ +# nativewindow_cocoa.cc +#endif + +plugingui_LDADD = $(PLUGIN_GUI_LIBS) libdggui.la plugingui_CXXFLAGS = $(SNDFILE_CXXFLAGS) $(PTHREAD_CFLAGS) $(EXPAT_CFLAGS) \ -I$(top_srcdir)/include $(PLUGIN_GUI_CPPFLAGS) -I$(top_srcdir)/src \ @@ -12,7 +95,6 @@ plugingui_CFLAGS = $(plugingui_CXXFLAGS) plugingui_SOURCES = \ testmain.cc \ - $(PLUGIN_GUI_SOURCES) \ $(top_srcdir)/src/configfile.cc \ $(top_srcdir)/src/thread.cc \ $(top_srcdir)/src/semaphore.cc \ diff --git a/test/Makefile.am b/test/Makefile.am index fbe10a9..1cb6ce1 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -4,7 +4,7 @@ SUBDIRS = dgreftest if ENABLE_TESTS include $(top_srcdir)/src/Makefile.am.drumgizmo -include $(top_srcdir)/plugingui/Makefile.am.plugingui +#include $(top_srcdir)/plugingui/Makefile.am.plugingui TESTS = resource enginetest paintertest resampler configfile audiocache \ audiocachefile audiocacheidmanager audiocacheeventhandler \ @@ -101,20 +101,11 @@ enginetest_SOURCES = \ enginetest.cc paintertest_CXXFLAGS = -DOUTPUT=\"paintertest\" $(CPPUNIT_CFLAGS) \ - -I$(top_srcdir)/src -I$(top_srcdir)/include \ - -I$(top_srcdir)/hugin -DDISABLE_HUGIN $(PTHREAD_CFLAGS) \ - $(PLUGIN_GUI_CPPFLAGS) -paintertest_LDFLAGS = $(CPPUNIT_LIBS) + -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_srcdir)/plugingui \ + -I$(top_srcdir)/hugin -DDISABLE_HUGIN $(PTHREAD_CFLAGS) +paintertest_LDFLAGS = $(CPPUNIT_LIBS) $(top_srcdir)/plugingui/libdggui.la paintertest_SOURCES = \ test.cc \ - $(top_srcdir)/plugingui/painter.cc \ - $(top_srcdir)/plugingui/pixelbuffer.cc \ - $(top_srcdir)/plugingui/colour.cc \ - $(top_srcdir)/plugingui/font.cc \ - $(top_srcdir)/plugingui/image.cc \ - $(top_srcdir)/plugingui/resource.cc \ - $(top_srcdir)/plugingui/resource_data.cc \ - $(top_srcdir)/plugingui/lodepng/lodepng.cpp \ paintertest.cc resampler_CXXFLAGS = -DOUTPUT=\"resampler\" $(CPPUNIT_CFLAGS) \ @@ -186,15 +177,8 @@ EXTRA_DIST = \ imagecachetest_CXXFLAGS = -DOUTPUT=\"imagecachetest\" $(CPPUNIT_CFLAGS) \ -I$(top_srcdir)/src -I$(top_srcdir)/plugingui -I$(top_srcdir)/hugin -imagecachetest_LDFLAGS = $(CPPUNIT_LIBS) +imagecachetest_LDFLAGS = $(CPPUNIT_LIBS) $(top_srcdir)/plugingui/libdggui.la imagecachetest_SOURCES = \ - $(top_srcdir)/hugin/hugin.c \ - $(top_srcdir)/plugingui/lodepng/lodepng.cpp \ - $(top_srcdir)/plugingui/resource_data.cc \ - $(top_srcdir)/plugingui/resource.cc \ - $(top_srcdir)/plugingui/image.cc \ - $(top_srcdir)/plugingui/imagecache.cc \ - $(top_srcdir)/plugingui/colour.cc \ imagecachetest.cc \ test.cc |