diff options
| author | jsc@umbraculum.org <jsc@umbraculum.org> | 2013-04-26 11:05:52 +0200 |
|---|---|---|
| committer | jsc@umbraculum.org <jsc@umbraculum.org> | 2013-04-26 11:05:52 +0200 |
| commit | c6de5ceeb79539926390221ba283fe1174558fe5 (patch) | |
| tree | caa478d7cc0272a2e1e07e25a51e3437b9983262 /plugingui | |
| parent | 5e2e2a6b4eed3a06a048f2ea1c609b2bb9659a5a (diff) | |
| parent | d74c332271e1c802b5f98a62e2ba13330669bd38 (diff) | |
Merge branch 'master' of http://git.drumgizmo.org/drumgizmo
Diffstat (limited to 'plugingui')
| -rw-r--r-- | plugingui/Makefile.am | 1 | ||||
| -rw-r--r-- | plugingui/Makefile.am.plugingui | 1 | ||||
| -rw-r--r-- | plugingui/Makefile.mingw32 | 6 |
3 files changed, 5 insertions, 3 deletions
diff --git a/plugingui/Makefile.am b/plugingui/Makefile.am index 3219987..fc91d58 100644 --- a/plugingui/Makefile.am +++ b/plugingui/Makefile.am @@ -14,7 +14,6 @@ plugingui_CFLAGS = $(plugingui_CXXFLAGS) plugingui_SOURCES = \ $(PLUGIN_GUI_SOURCES) \ - directory.cc \ $(top_srcdir)/src/thread.cc \ $(top_srcdir)/src/semaphore.cc diff --git a/plugingui/Makefile.am.plugingui b/plugingui/Makefile.am.plugingui index 8d9a728..9ad5233 100644 --- a/plugingui/Makefile.am.plugingui +++ b/plugingui/Makefile.am.plugingui @@ -24,6 +24,7 @@ PLUGIN_GUI_SOURCES = \ $(top_srcdir)/plugingui/listboxbasic.cc \ $(top_srcdir)/plugingui/knob.cc \ $(top_srcdir)/plugingui/filebrowser.cc \ + $(top_srcdir)/plugingui/directory.cc \ $(top_srcdir)/plugingui/image.cc \ $(top_srcdir)/plugingui/combobox.cc \ $(top_srcdir)/plugingui/progressbar.cc \ diff --git a/plugingui/Makefile.mingw32 b/plugingui/Makefile.mingw32 index a4a8b75..746c066 100644 --- a/plugingui/Makefile.mingw32 +++ b/plugingui/Makefile.mingw32 @@ -32,9 +32,11 @@ CXX_SOURCES = \ $(top_srcdir)/plugingui/listboxthin.cc \ $(top_srcdir)/plugingui/listboxbasic.cc \ $(top_srcdir)/plugingui/filebrowser.cc \ + $(top_srcdir)/plugingui/directory.cc \ $(top_srcdir)/plugingui/knob.cc \ $(top_srcdir)/plugingui/combobox.cc \ $(top_srcdir)/plugingui/image.cc \ + $(top_srcdir)/plugingui/scrollbar.cc \ $(top_srcdir)/plugingui/progressbar.cc \ $(top_srcdir)/plugingui/resource.cc \ $(top_srcdir)/plugingui/resource_data.cc \ @@ -52,10 +54,10 @@ plugingui.exe: $(OBJECTS) g++ -static -static-libgcc $(OBJECTS) $(LDFLAGS) $(CFLAGS) -o $@ %.o: %.cc - g++ -static -static-libgcc -O2 -c $(CFLAGS) $< -o $@ + g++ -g -static -static-libgcc -O2 -c $(CFLAGS) $< -o $@ %.o: %.c - gcc -static -static-libgcc -O2 -c $(CFLAGS) $< -o $@ + gcc -g -static -static-libgcc -O2 -c $(CFLAGS) $< -o $@ clean: rm -rf $(OBJECTS) plugingui.exe |