Merge remote-tracking branch 'chungy/chocolate-midivolume' into chocolate-midivolume

This commit is contained in:
Alex Mayfield 2017-02-26 17:27:45 -05:00
commit 668d03699c
2 changed files with 5 additions and 5 deletions

View file

@ -3,9 +3,9 @@ AM_CFLAGS=-I$(top_srcdir)/src @SDLMIXER_CFLAGS@
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

View file

@ -44,8 +44,8 @@ staging-%:
$(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