From 645250e1cd8ce9bc1faea599df7a1b05836bfeb8 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Tue, 29 Dec 2020 16:09:43 +0100 Subject: Split UI code into application/plugin UI and UI library. --- plugingui/Makefile.am | 179 +++++--------------------------------------------- 1 file changed, 17 insertions(+), 162 deletions(-) (limited to 'plugingui/Makefile.am') diff --git a/plugingui/Makefile.am b/plugingui/Makefile.am index ab2e076..706b3c9 100644 --- a/plugingui/Makefile.am +++ b/plugingui/Makefile.am @@ -1,8 +1,8 @@ SUBDIRS = locale DISTDIRS = locale -noinst_PROGRAMS = plugingui rcgen -noinst_LTLIBRARIES = libdggui.la +noinst_PROGRAMS = plugingui +noinst_LTLIBRARIES = libplugingui.la # If you add a file here, remember to add it to plugin/Makefile.mingw32.in RES = \ @@ -70,14 +70,14 @@ BUILT_SOURCES = \ resource_data.cc \ $(NLS_RES) -resource_data.cc: rcgen$(EXEEXT) $(RES) $(NLS_RES) - $(rcgen_verbose)./rcgen$(EXEEXT) -s $(top_srcdir)/plugingui/ -s $(top_builddir)/plugingui/ -o $@ $(RES) $(NLS_RES) +resource_data.cc: $(top_builddir)/dggui/rcgen$(EXEEXT) $(RES) $(NLS_RES) + $(rcgen_verbose)$(top_builddir)/dggui/rcgen$(EXEEXT) -s $(top_srcdir)/plugingui/ -s $(top_builddir)/plugingui/ -o $@ $(RES) $(NLS_RES) CLEANFILES = \ resource_data.cc \ $(NLS_RES) -libdggui_la_CPPFLAGS = \ +libplugingui_la_CPPFLAGS = \ $(DEBUG_FLAGS) \ -I$(top_srcdir) \ $(GUI_CPPFLAGS) \ @@ -90,205 +90,64 @@ libdggui_la_CPPFLAGS = \ -DLODEPNG_NO_COMPILE_ERROR_TEXT \ -DLODEPNG_NO_COMPILE_CPP -libdggui_la_CFLAGS = +libplugingui_la_CFLAGS = -libdggui_la_LIBTOOLFLAGS=--tag=CC +libplugingui_la_LIBTOOLFLAGS=--tag=CC -libdggui_la_LIBADD = \ +libplugingui_la_LIBADD = \ + $(top_builddir)/dggui/libdggui.la \ $(GUI_LIBS) $(PTHREAD_LIBS) # If you add a file here, remember to add it to plugin/Makefile.mingw32.in GUI_SRC = \ abouttab.cc \ bleedcontrolframecontent.cc \ - button.cc \ - button_base.cc \ - checkbox.cc \ - colour.cc \ - combobox.cc \ - dialog.cc \ diskstreamingframecontent.cc \ drumkitframecontent.cc \ drumkittab.cc \ - eventhandler.cc \ filebrowser.cc \ - font.cc \ - frame.cc \ - helpbutton.cc \ - humanizerframecontent.cc \ humaniservisualiser.cc \ - image.cc \ - imagecache.cc \ - knob.cc \ - label.cc \ - layout.cc \ - led.cc \ - lineedit.cc \ - listbox.cc \ - listboxbasic.cc \ - listboxthin.cc \ + humanizerframecontent.cc \ maintab.cc \ mainwindow.cc \ - painter.cc \ - pixelbuffer.cc \ pluginconfig.cc \ - powerbutton.cc \ powerwidget.cc \ - progressbar.cc \ resamplingframecontent.cc \ - resource.cc \ sampleselectionframecontent.cc \ - scrollbar.cc \ - slider.cc \ - stackedwidget.cc \ statusframecontent.cc \ - tabbutton.cc \ - tabwidget.cc \ - textedit.cc \ - texture.cc \ - texturedbox.cc \ timingframecontent.cc \ - toggle.cc \ - tooltip.cc \ - uitranslation.cc \ - utf8.cc \ - verticalline.cc \ visualizerframecontent.cc \ - voicelimitframecontent.cc \ - widget.cc \ - window.cc + voicelimitframecontent.cc GUI_HDR = \ abouttab.h \ bleedcontrolframecontent.h \ - button.h \ - button_base.h \ - canvas.h \ - checkbox.h \ - colour.h \ - combobox.h \ - dialog.h \ diskstreamingframecontent.h \ - drawable.h \ drumkitframecontent.h \ drumkittab.h \ - eventhandler.h \ filebrowser.h \ - font.h \ - frame.h \ - guievent.h \ - helpbutton.h \ humaniservisualiser.h \ humanizerframecontent.h \ - image.h \ - imagecache.h \ - knob.h \ - label.h \ labeledcontrol.h \ - layout.h \ - led.h \ - lineedit.h \ - listbox.h \ - listboxbasic.h \ - listboxthin.h \ maintab.h \ mainwindow.h \ - nativewindow.h \ - nativewindow_cocoa.h \ - nativewindow_cocoa.mm \ - nativewindow_pugl.h \ - nativewindow_pugl.cc \ - nativewindow_win32.h \ - nativewindow_win32.cc \ - nativewindow_x11.h \ - nativewindow_x11.cc \ - painter.h \ - pixelbuffer.h \ pluginconfig.h \ - powerbutton.h \ powerwidget.h \ - progressbar.h \ resamplingframecontent.h \ - resource.h \ - resource_data.h \ sampleselectionframecontent.h \ - scrollbar.h \ - slider.h \ - stackedwidget.h \ statusframecontent.h \ - tabbutton.h \ - tabwidget.h \ - textedit.h \ - texture.h \ - texturedbox.h \ timingframecontent.h \ - toggle.h \ - tooltip.h \ - uitranslation.h \ - utf8.h \ - verticalline.h \ visualizerframecontent.h \ - voicelimitframecontent.h \ - widget.h \ - window.h + voicelimitframecontent.h -libdggui_la_SOURCES = \ - $(GUI_SRC) \ - lodepng/lodepng.cpp +libplugingui_la_SOURCES = \ + $(GUI_SRC) -nodist_libdggui_la_SOURCES = \ +nodist_libplugingui_la_SOURCES = \ $(top_builddir)/plugingui/resource_data.cc -if ENABLE_X11 -nodist_libdggui_la_SOURCES += \ - nativewindow_x11.cc -endif - -if ENABLE_WIN32 -nodist_libdggui_la_SOURCES += \ - nativewindow_win32.cc -endif - -if ENABLE_COCOA -nodist_libdggui_la_SOURCES += \ - nativewindow_cocoa.mm - -libdggui_la_OBJCXXFLAGS = \ - -fblocks -endif - -if ENABLE_PUGL_X11 -nodist_libdggui_la_SOURCES += \ - nativewindow_pugl.cc \ - $(top_srcdir)/pugl/pugl/pugl_x11.c - -libdggui_la_CPPFLAGS += \ - -I$(top_srcdir)/pugl - -libdggui_la_CFLAGS += \ - -std=c99 -endif - -if ENABLE_PUGL_WIN32 -nodist_libdggui_la_SOURCES += \ - nativewindow_pugl.cc \ - $(top_srcdir)/pugl/pugl/pugl_win.cpp - -libdggui_la_CPPFLAGS += \ - -I$(top_srcdir)/pugl -endif - -if ENABLE_PUGL_COCOA -nodist_libdggui_la_SOURCES += \ - nativewindow_pugl.cc \ - $(top_srcdir)/pugl/pugl/pugl_osx.m - -libdggui_la_CPPFLAGS += \ - -I$(top_srcdir)/pugl -endif - plugingui_LDADD = \ - libdggui.la \ + libplugingui.la \ $(top_builddir)/src/libdg.la \ $(top_builddir)/src/libnls.la @@ -297,6 +156,7 @@ plugingui_CXXFLAGS = \ $(GUI_CPPFLAGS) \ $(SNDFILE_CXXFLAGS) \ $(PTHREAD_CFLAGS) \ + -I$(top_srcdir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/hugin @@ -306,11 +166,6 @@ plugingui_SOURCES = \ testmain.cc \ $(top_srcdir)/hugin/hugin.c -rcgen_LDFLAGS = -static -rcgen_CXXFLAGS = -I$(top_srcdir)/getoptpp -rcgen_SOURCES = \ - rcgen.cc - EXTRA_DIST = \ $(RES) \ $(GUI_HDR) -- cgit v1.2.3