Add midiproc to the automake system.

This commit is contained in:
Mike Swanson 2017-02-21 20:57:48 -08:00
parent 20d0f50398
commit 9f9d647297
8 changed files with 32 additions and 4 deletions

View file

@ -70,7 +70,7 @@ strifedocs_DATA = $(DOC_FILES) README.Strife.md
MAINTAINERCLEANFILES = $(AUX_DIST_GEN)
SUBDIRS=textscreen opl pcsound data src man
SUBDIRS=textscreen midiproc opl pcsound data src man
DIST_SUBDIRS=pkg $(SUBDIRS)

View file

@ -151,6 +151,7 @@ AC_OUTPUT([
Makefile
man/Makefile
man/bash-completion/Makefile
midiproc/Makefile
opl/Makefile
opl/examples/Makefile
pcsound/Makefile

6
midiproc/.gitignore vendored Normal file
View file

@ -0,0 +1,6 @@
Makefile.in
Makefile
*.exe
.deps
tags
TAGS

11
midiproc/Makefile.am Normal file
View file

@ -0,0 +1,11 @@
AM_CFLAGS=-I$(top_srcdir)/src @SDLMIXER_CFLAGS@
if HAVE_WINDRES
noinst_PROGRAMS = midiproc
midiproc_LDADD = @SDLMIXER_LIBS@
midiproc_SOURCES = buffer.c buffer.h main.c
endif

View file

@ -15,6 +15,8 @@
// A simple buffer and reader implementation.
//
#ifdef _WIN32
#include "buffer.h"
#include <stdlib.h>
@ -243,3 +245,5 @@ char *Reader_ReadString(buffer_reader_t *reader)
reader->pos = dp + 1;
return (char*)data_start;
}
#endif // #ifdef _WIN32

View file

@ -24,6 +24,8 @@
// Seriously, how did they screw up something so fundamental?
//
#ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <stdlib.h>
@ -427,3 +429,4 @@ int main(int argc, char *argv[])
return EXIT_SUCCESS;
}
#endif // #ifdef _WIN32

View file

@ -43,14 +43,17 @@ staging-%:
./cp-with-libs --ldflags="$(LDFLAGS)" \
$(TOPLEVEL)/src/$(PROGRAM_PREFIX)setup.exe \
$@/$(PROGRAM_PREFIX)$*-setup.exe
./cp-with-libs --ldflags="$(LDFLAGS)" \
$(TOPLEVEL)/midiproc/midiproc.exe \
$@/midiproc.exe
$(STRIP) $@/*.exe $@/*.dll
for f in $(DOC_FILES); do \
cp $(TOPLEVEL)/$$f $@/$$(basename $$f .md).txt; \
done
cp $(TOPLEVEL)/man/CMDLINE.$* $@/CMDLINE.txt
$(TOPLEVEL)/man/simplecpp -D_WIN32 -DPRECOMPILED \
-D$(shell echo $* | tr a-z A-Z) \
< $(TOPLEVEL)/man/INSTALL.template \
@ -59,4 +62,3 @@ staging-%:
clean:
rm -f $(ZIPS)
rm -rf staging-*

View file

@ -68,6 +68,7 @@ i_endoom.c i_endoom.h \
i_input.c i_input.h \
i_joystick.c i_joystick.h \
i_swap.h \
i_midipipe.c i_midipipe.h \
i_oplmusic.c \
i_pcsound.c \
i_sdlmusic.c \