From 956902538fefcdc0948293ee3f3d5e1b4de745c8 Mon Sep 17 00:00:00 2001 From: Yamagi Burmeister Date: Tue, 7 Aug 2018 09:31:08 +0200 Subject: [PATCH] Move sound.c into the sound system source and rename to sdl.c. The OpenAL backend was already part of the sound system source. And there's no need for the SDL backend to be part of the generic backends. --- CMakeLists.txt | 2 +- Makefile | 2 +- src/{backends/sdl/sound.c => client/sound/sdl.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename src/{backends/sdl/sound.c => client/sound/sdl.c} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index bb5bd757..3aebff7b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -168,7 +168,6 @@ set(Backends-Generic-Source ${BACKENDS_SRC_DIR}/sdl/input.c ${BACKENDS_SRC_DIR}/sdl/refresh.c - ${BACKENDS_SRC_DIR}/sdl/sound.c ) set(Backends-Generic-Header @@ -322,6 +321,7 @@ set(Client-Source ${CLIENT_SRC_DIR}/sound/ogg.c ${CLIENT_SRC_DIR}/sound/openal.c ${CLIENT_SRC_DIR}/sound/qal.c + ${CLIENT_SRC_DIR}/sound/sdl.c ${CLIENT_SRC_DIR}/sound/sound.c ${CLIENT_SRC_DIR}/sound/wave.c ${COMMON_SRC_DIR}/argproc.c diff --git a/Makefile b/Makefile index e83a038c..d490d1c6 100755 --- a/Makefile +++ b/Makefile @@ -694,7 +694,6 @@ CLIENT_OBJS_ := \ src/backends/generic/vid.o \ src/backends/sdl/input.o \ src/backends/sdl/refresh.o \ - src/backends/sdl/sound.o \ src/client/cl_cin.o \ src/client/cl_console.o \ src/client/cl_download.o \ @@ -715,6 +714,7 @@ CLIENT_OBJS_ := \ src/client/menu/menu.o \ src/client/menu/qmenu.o \ src/client/menu/videomenu.o \ + src/client/sound/sdl.o \ src/client/sound/ogg.o \ src/client/sound/openal.o \ src/client/sound/qal.o \ diff --git a/src/backends/sdl/sound.c b/src/client/sound/sdl.c similarity index 100% rename from src/backends/sdl/sound.c rename to src/client/sound/sdl.c