ref: 668d03699c8fd729c728fc2e7a6b8e21e7a815d1
parent: 37ea28a4550342e8f3bd811888b7f6a021487d55
parent: f6581c534ca2550fecacb457b791ff45e983be88
author: Alex Mayfield <[email protected]>
date: Sun Feb 26 12:27:45 EST 2017
Merge remote-tracking branch 'chungy/chocolate-midivolume' into chocolate-midivolume
--- a/midiproc/Makefile.am
+++ b/midiproc/Makefile.am
@@ -3,9 +3,9 @@
if HAVE_WINDRES
-noinst_PROGRAMS = midiproc
+noinst_PROGRAMS = @PROGRAM_PREFIX@midiproc
-midiproc_LDADD = @SDLMIXER_LIBS@
-midiproc_SOURCES = buffer.c buffer.h main.c
+@PROGRAM_PREFIX@midiproc_LDADD = @SDLMIXER_LIBS@
+@PROGRAM_PREFIX@midiproc_SOURCES = buffer.c buffer.h main.c
endif
--- a/pkg/win32/GNUmakefile
+++ b/pkg/win32/GNUmakefile
@@ -44,8 +44,8 @@
$(TOPLEVEL)/src/$(PROGRAM_PREFIX)setup.exe \
$@/$(PROGRAM_PREFIX)$*-setup.exe
./cp-with-libs --ldflags="$(LDFLAGS)" \
- $(TOPLEVEL)/midiproc/midiproc.exe \
- $@/midiproc.exe
+ $(TOPLEVEL)/midiproc/$(PROGRAM_PREFIX)midiproc.exe \
+ $@/$(PROGRAM_PREFIX)midiproc.exe
$(STRIP) $@/*.exe $@/*.dll