From 746de57f16482b49c8a25e1033257e6cde68b5cd Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Thu, 20 Apr 2017 21:55:23 +0200 Subject: Fix resources on static windows build (Makefile.mingw32) and add note about remembering to add file to the mingw32 Makefile when we change the real Makefiles... --- plugin/Makefile.mingw32.in | 27 ++++++++++++++++++++++++++- plugingui/Makefile.am | 2 ++ src/Makefile.am | 1 + 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/plugin/Makefile.mingw32.in b/plugin/Makefile.mingw32.in index 9614496..795f07a 100644 --- a/plugin/Makefile.mingw32.in +++ b/plugin/Makefile.mingw32.in @@ -128,9 +128,34 @@ SRC = \ @top_srcdir@/plugin/plugingizmo/pluginvst.cc \ drumgizmo_plugin.cc +RES = \ + resources/bg.png \ + resources/bypass_button.png \ + resources/font.png \ + resources/fontemboss.png \ + resources/knob.png \ + resources/logo.png \ + resources/png_error \ + resources/progress.png \ + resources/pushbutton.png \ + resources/sidebar.png \ + resources/slider.png \ + resources/switch_back_off.png \ + resources/switch_back_on.png \ + resources/switch_front.png \ + resources/tab.png \ + resources/thinlistbox.png \ + resources/topbar.png \ + resources/toplogo.png \ + resources/vertline.png \ + resources/widget.png \ + ../ABOUT \ + ../AUTHORS \ + ../COPYING + all: g++ @top_srcdir@/plugingui/rcgen.cc -o @top_srcdir@/plugingui/rcgen - (cd @top_srcdir@/plugingui/resources; ../rcgen * > ../resource_data.cc) + (cd @top_srcdir@/plugingui; ./rcgen $(RES) > resource_data.cc) gcc $(DBG_CFLAGS) @top_srcdir@/hugin/hugin.c -c gcc $(DBG_CFLAGS) @top_srcdir@/hugin/hugin_syslog.c -c g++ $(CXXFLAGS) -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_CPPFLAGS} $(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 diff --git a/plugingui/Makefile.am b/plugingui/Makefile.am index 83789b8..c4fc9f2 100644 --- a/plugingui/Makefile.am +++ b/plugingui/Makefile.am @@ -1,6 +1,7 @@ noinst_PROGRAMS = plugingui rcgen noinst_LTLIBRARIES = libdggui.la +# If you add a file here, remember to add it to plugin/Makefile.mingw32.in RES = \ resources/bg.png \ resources/bypass_button.png \ @@ -44,6 +45,7 @@ libdggui_la_CPPFLAGS = \ libdggui_la_LIBADD = \ $(GUI_LIBS) $(PTHREAD_LIBS) +# If you add a file here, remember to add it to plugin/Makefile.mingw32.in nodist_libdggui_la_SOURCES = \ button.cc \ button_base.cc \ diff --git a/src/Makefile.am b/src/Makefile.am index 06e189f..d2f2567 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,6 +10,7 @@ libdg_la_LIBADD = \ $(ZITA_LIBS) $(SNDFILE_LIBS) $(EXPAT_LIBS) $(SAMPLERATE_LIBS) \ $(PTHREAD_LIBS) +# If you add a file here, remember to add it to plugin/Makefile.mingw32.in nodist_libdg_la_SOURCES = \ audiocachefile.cc \ audiocache.cc \ -- cgit v1.2.3