diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | pcsound/Makefile.am (renamed from src/pcsound/Makefile.am) | 0 | ||||
| -rw-r--r-- | pcsound/pcsound.c (renamed from src/pcsound/pcsound.c) | 0 | ||||
| -rw-r--r-- | pcsound/pcsound.h (renamed from src/pcsound/pcsound.h) | 0 | ||||
| -rw-r--r-- | pcsound/pcsound_sdl.c (renamed from src/pcsound/pcsound_sdl.c) | 0 | ||||
| -rw-r--r-- | pcsound/pcsound_win32.c (renamed from src/pcsound/pcsound_win32.c) | 0 | ||||
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/i_pcsound.c | 2 |
9 files changed, 5 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 8e2a5e39..efa6b9fa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,7 +39,7 @@ EXTRA_DIST= \ MAINTAINERCLEANFILES = $(AUX_DIST_GEN) docdir=$(prefix)/share/doc/@PACKAGE@ -SUBDIRS=textscreen src man setup +SUBDIRS=textscreen pcsound src man setup CMDLINE : src/ ./man/docgen -p $? > $@ diff --git a/configure.in b/configure.in index c43ab84c..2d2789ff 100644 --- a/configure.in +++ b/configure.in @@ -74,7 +74,7 @@ textscreen/examples/Makefile setup/Makefile man/Makefile src/Makefile -src/pcsound/Makefile +pcsound/Makefile src/chocolate-doom-res.rc setup/chocolate-setup-res.rc ]) diff --git a/src/pcsound/Makefile.am b/pcsound/Makefile.am index 77957d72..77957d72 100644 --- a/src/pcsound/Makefile.am +++ b/pcsound/Makefile.am diff --git a/src/pcsound/pcsound.c b/pcsound/pcsound.c index 9c18eb01..9c18eb01 100644 --- a/src/pcsound/pcsound.c +++ b/pcsound/pcsound.c diff --git a/src/pcsound/pcsound.h b/pcsound/pcsound.h index 1adee416..1adee416 100644 --- a/src/pcsound/pcsound.h +++ b/pcsound/pcsound.h diff --git a/src/pcsound/pcsound_sdl.c b/pcsound/pcsound_sdl.c index 50820394..50820394 100644 --- a/src/pcsound/pcsound_sdl.c +++ b/pcsound/pcsound_sdl.c diff --git a/src/pcsound/pcsound_win32.c b/pcsound/pcsound_win32.c index 090c0bbd..090c0bbd 100644 --- a/src/pcsound/pcsound_win32.c +++ b/pcsound/pcsound_win32.c diff --git a/src/Makefile.am b/src/Makefile.am index 53ef775c..4d694293 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,7 +3,7 @@ gamesdir = $(prefix)/games games_PROGRAMS = chocolate-doom chocolate-server -AM_CFLAGS = -I../textscreen @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@ +AM_CFLAGS = -I../textscreen -I../pcsound @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@ DEDSERV_FILES=\ d_dedicated.c \ @@ -22,8 +22,6 @@ z_native.c z_zone.h chocolate_server_SOURCES=$(DEDSERV_FILES) chocolate_server_LDADD = @LDFLAGS@ @SDL_LIBS@ @SDLNET_LIBS@ -SUBDIRS=pcsound - SOURCE_FILES=\ am_map.c am_map.h \ deh_ammo.c \ @@ -141,7 +139,7 @@ else chocolate_doom_SOURCES=$(SOURCE_FILES) endif -chocolate_doom_LDADD = ../textscreen/libtextscreen.a pcsound/libpcsound.a @LDFLAGS@ @SDL_LIBS@ @SDLMIXER_LIBS@ @SDLNET_LIBS@ +chocolate_doom_LDADD = ../textscreen/libtextscreen.a ../pcsound/libpcsound.a @LDFLAGS@ @SDL_LIBS@ @SDLMIXER_LIBS@ @SDLNET_LIBS@ EXTRA_DIST = \ chocolate_doom_icon.c \ diff --git a/src/i_pcsound.c b/src/i_pcsound.c index 926e5f1d..d9b76eec 100644 --- a/src/i_pcsound.c +++ b/src/i_pcsound.c @@ -35,7 +35,7 @@ #include "w_wad.h" #include "z_zone.h" -#include "pcsound/pcsound.h" +#include "pcsound.h" static boolean pcs_initialised = false; |