diff options
Diffstat (limited to 'vst')
| -rw-r--r-- | vst/Makefile.am | 5 | ||||
| -rw-r--r-- | vst/Makefile.mingw32.in | 17 | ||||
| -rw-r--r-- | vst/drumgizmo_vst.cc | 2 | ||||
| -rw-r--r-- | vst/drumgizmo_vst.h | 2 |
4 files changed, 12 insertions, 14 deletions
diff --git a/vst/Makefile.am b/vst/Makefile.am index 7bb7214..d6c5c9e 100644 --- a/vst/Makefile.am +++ b/vst/Makefile.am @@ -40,7 +40,7 @@ libdg_la_CXXFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/plugingui \ -DUSE_THREAD $(SAMPLERATE_CFLAGS) nodist_libdrumgizmo_vst_la_SOURCES = \ - $(VST_SOURCES) + $(VST_SOURCES) libdrumgizmo_vst_la_SOURCES = \ drumgizmo_vst.cc \ @@ -50,5 +50,4 @@ libdrumgizmo_vst_la_SOURCES = \ libdrumgizmo_vst_la_LDFLAGS = -no-undefined -shared libdrumgizmo_vst_la_LIBADD = libdg.la libdrumgizmo_vst_la_CXXFLAGS = -w $(VST_CPPFLAGS) \ - -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_srcdir)/plugingui - + -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_srcdir)/plugingui
\ No newline at end of file diff --git a/vst/Makefile.mingw32.in b/vst/Makefile.mingw32.in index 804c97c..5a087b7 100644 --- a/vst/Makefile.mingw32.in +++ b/vst/Makefile.mingw32.in @@ -38,7 +38,7 @@ DG_SRC = \ DG_CFLAGS = -I.. -I../include -I../src -DSSE -msse -msse2 -DDISABLE_HUGIN GUI_SRC = \ - @top_srcdir@/plugingui/nativewindow_x11.cc \ + @top_srcdir@/plugingui/dgwindow.cc \ @top_srcdir@/plugingui/nativewindow_win32.cc \ @top_srcdir@/plugingui/plugingui.cc \ @top_srcdir@/plugingui/pluginconfig.cc \ @@ -53,11 +53,13 @@ GUI_SRC = \ @top_srcdir@/plugingui/pixelbuffer.cc \ @top_srcdir@/plugingui/lineedit.cc \ @top_srcdir@/plugingui/led.cc \ + @top_srcdir@/plugingui/layout.cc \ @top_srcdir@/plugingui/cacheaudiofile.cc \ @top_srcdir@/plugingui/cachemanager.cc \ @top_srcdir@/plugingui/checkbox.cc \ @top_srcdir@/plugingui/slider.cc \ @top_srcdir@/plugingui/scrollbar.cc \ + @top_srcdir@/plugingui/textedit.cc \ @top_srcdir@/plugingui/listbox.cc \ @top_srcdir@/plugingui/listboxthin.cc \ @top_srcdir@/plugingui/listboxbasic.cc \ @@ -88,13 +90,10 @@ DBG_CFLAGS=-I../hugin -DWITH_HUG_SYSLOG -DWITH_HUG_MUTEX -DDISABLE_HUGIN EXPAT_CFLAGS=@EXPAT_CFLAGS@ EXPAT_LIBS=@EXPAT_LIBS@ - + SNDFILE_CFLAGS=@SNDFILE_CFLAGS@ SNDFILE_LIBS=@SNDFILE_LIBS@ -ZLIB_CFLAGS=@ZLIB_CFLAGS@ -ZLIB_LIBS=@ZLIB_LIBS@ - SRC_CFLAGS=@SAMPLERATE_CFLAGS@ SRC_LIBS=@SAMPLERATE_LIBS@ @@ -114,7 +113,7 @@ SRC = \ # #C_SOURCES=$(DBG_SRC) #CXX_SOURCES=$(GUI_SRC) $(DG_SRC) -#CPP_SOURCES=$(VST_SRC) +#CPP_SOURCES=$(VST_SRC) # #OBJECTS=$(CXX_SOURCES:.cc=.o) $(CPP_SOURCES:.cpp=.o) $(C_SOURCES:.c=.o) #all: $(CXX_SOURCES) $(CPP_SOURCES) $(C_SOURCES) drumgizmo_vst.dll @@ -136,11 +135,11 @@ SRC = \ # ######################## - + all: gcc $(DBG_CFLAGS) @top_srcdir@/hugin/hugin.c -c gcc $(DBG_CFLAGS) @top_srcdir@/hugin/hugin_syslog.c -c - g++ -std=c++11 -static -static-libgcc -O2 -g -Wall $(DBG_CFLAGS) $(DG_CFLAGS) $(DG_LIBS) $(VST_CFLAGS) hugin.o hugin_syslog.o $(DG_SRC) $(VST_SRC) ${SRC} ${GUI_SRC} ${GUI_CFLAGS} $(GUI_LIBS) $(EXPAT_CFLAGS) $(ZLIB_CFLAGS) $(SRC_CFLAGS) $(ZITA_CXXFLAGS) $(EXPAT_LIBS) $(ZLIB_LIBS) $(SNDFILE_CFLAGS) $(SNDFILE_LIBS) $(SRC_LIBS) $(ZITA_LIBS) -shared -o drumgizmo_vst.dll -Wl,--out-implib,libdrumgizmo_vst.a - + g++ -std=c++11 -static -static-libgcc -O2 -g -Wall $(DBG_CFLAGS) $(DG_CFLAGS) $(DG_LIBS) $(VST_CFLAGS) hugin.o hugin_syslog.o $(DG_SRC) $(VST_SRC) ${SRC} ${GUI_SRC} ${GUI_CFLAGS} $(GUI_LIBS) $(EXPAT_CFLAGS) $(SRC_CFLAGS) $(ZITA_CXXFLAGS) $(EXPAT_LIBS) $(SNDFILE_CFLAGS) $(SNDFILE_LIBS) $(SRC_LIBS) $(ZITA_LIBS) -shared -o drumgizmo_vst.dll -Wl,--out-implib,libdrumgizmo_vst.a + clean: del -f drumgizmo_vst.dll libdrumgizmo_vst.a diff --git a/vst/drumgizmo_vst.cc b/vst/drumgizmo_vst.cc index 109f8b9..70d0847 100644 --- a/vst/drumgizmo_vst.cc +++ b/vst/drumgizmo_vst.cc @@ -49,7 +49,7 @@ bool DGEditor::open(void* ptr) DEBUG(dgeditor, "open GUI (new PluginGUI)\n"); if(plugingui) delete plugingui; - plugingui = new PluginGUI(); + plugingui = new GUI::PluginGUI(); // plugingui->setChangeMidimapCallback(midimapHandler, dgeff); // plugingui->show(); diff --git a/vst/drumgizmo_vst.h b/vst/drumgizmo_vst.h index 4497c48..b15122c 100644 --- a/vst/drumgizmo_vst.h +++ b/vst/drumgizmo_vst.h @@ -112,7 +112,7 @@ public: private: DrumGizmoVst* dgeff; - PluginGUI *plugingui; + GUI::PluginGUI *plugingui; DrumGizmo *drumgizmo; }; |