mirror of
https://github.com/yquake2/yquake2remaster.git
synced 2024-11-10 07:12:07 +00:00
Move qal.c and qal.h to the other sound system sources.
The OpenAL backends used only by the sound system, there no need to have them in the generic part of the sources.
This commit is contained in:
parent
98d315ff20
commit
5501c38736
6 changed files with 5 additions and 5 deletions
|
@ -164,7 +164,6 @@ endif()
|
||||||
|
|
||||||
set(Backends-Generic-Source
|
set(Backends-Generic-Source
|
||||||
${BACKENDS_SRC_DIR}/generic/misc.c
|
${BACKENDS_SRC_DIR}/generic/misc.c
|
||||||
${BACKENDS_SRC_DIR}/generic/qal.c
|
|
||||||
${BACKENDS_SRC_DIR}/generic/vid.c
|
${BACKENDS_SRC_DIR}/generic/vid.c
|
||||||
|
|
||||||
${BACKENDS_SRC_DIR}/sdl/input.c
|
${BACKENDS_SRC_DIR}/sdl/input.c
|
||||||
|
@ -174,7 +173,6 @@ set(Backends-Generic-Source
|
||||||
|
|
||||||
set(Backends-Generic-Header
|
set(Backends-Generic-Header
|
||||||
${BACKENDS_SRC_DIR}/generic/header/input.h
|
${BACKENDS_SRC_DIR}/generic/header/input.h
|
||||||
${BACKENDS_SRC_DIR}/generic/header/qal.h
|
|
||||||
)
|
)
|
||||||
|
|
||||||
set(Backends-Unix-Source
|
set(Backends-Unix-Source
|
||||||
|
@ -323,6 +321,7 @@ set(Client-Source
|
||||||
${CLIENT_SRC_DIR}/menu/videomenu.c
|
${CLIENT_SRC_DIR}/menu/videomenu.c
|
||||||
${CLIENT_SRC_DIR}/sound/ogg.c
|
${CLIENT_SRC_DIR}/sound/ogg.c
|
||||||
${CLIENT_SRC_DIR}/sound/openal.c
|
${CLIENT_SRC_DIR}/sound/openal.c
|
||||||
|
${CLIENT_SRC_DIR}/sound/qal.c
|
||||||
${CLIENT_SRC_DIR}/sound/sound.c
|
${CLIENT_SRC_DIR}/sound/sound.c
|
||||||
${CLIENT_SRC_DIR}/sound/wave.c
|
${CLIENT_SRC_DIR}/sound/wave.c
|
||||||
${COMMON_SRC_DIR}/argproc.c
|
${COMMON_SRC_DIR}/argproc.c
|
||||||
|
@ -366,6 +365,7 @@ set(Client-Header
|
||||||
${CLIENT_SRC_DIR}/header/vid.h
|
${CLIENT_SRC_DIR}/header/vid.h
|
||||||
${CLIENT_SRC_DIR}/menu/header/qmenu.h
|
${CLIENT_SRC_DIR}/menu/header/qmenu.h
|
||||||
${CLIENT_SRC_DIR}/sound/header/local.h
|
${CLIENT_SRC_DIR}/sound/header/local.h
|
||||||
|
${CLIENT_SRC_DIR}/sound/header/qal.h
|
||||||
${CLIENT_SRC_DIR}/sound/header/sound.h
|
${CLIENT_SRC_DIR}/sound/header/sound.h
|
||||||
${CLIENT_SRC_DIR}/sound/header/vorbis.h
|
${CLIENT_SRC_DIR}/sound/header/vorbis.h
|
||||||
${COMMON_SRC_DIR}/header/common.h
|
${COMMON_SRC_DIR}/header/common.h
|
||||||
|
|
2
Makefile
2
Makefile
|
@ -691,7 +691,6 @@ GAME_OBJS_ = \
|
||||||
# Used by the client
|
# Used by the client
|
||||||
CLIENT_OBJS_ := \
|
CLIENT_OBJS_ := \
|
||||||
src/backends/generic/misc.o \
|
src/backends/generic/misc.o \
|
||||||
src/backends/generic/qal.o \
|
|
||||||
src/backends/generic/vid.o \
|
src/backends/generic/vid.o \
|
||||||
src/backends/sdl/input.o \
|
src/backends/sdl/input.o \
|
||||||
src/backends/sdl/refresh.o \
|
src/backends/sdl/refresh.o \
|
||||||
|
@ -718,6 +717,7 @@ CLIENT_OBJS_ := \
|
||||||
src/client/menu/videomenu.o \
|
src/client/menu/videomenu.o \
|
||||||
src/client/sound/ogg.o \
|
src/client/sound/ogg.o \
|
||||||
src/client/sound/openal.o \
|
src/client/sound/openal.o \
|
||||||
|
src/client/sound/qal.o \
|
||||||
src/client/sound/sound.o \
|
src/client/sound/sound.o \
|
||||||
src/client/sound/wave.o \
|
src/client/sound/wave.o \
|
||||||
src/common/argproc.o \
|
src/common/argproc.o \
|
||||||
|
|
|
@ -35,8 +35,8 @@
|
||||||
#ifdef USE_OPENAL
|
#ifdef USE_OPENAL
|
||||||
|
|
||||||
#include "../header/client.h"
|
#include "../header/client.h"
|
||||||
#include "../../backends/generic/header/qal.h"
|
|
||||||
#include "header/local.h"
|
#include "header/local.h"
|
||||||
|
#include "header/qal.h"
|
||||||
#include "header/vorbis.h"
|
#include "header/vorbis.h"
|
||||||
|
|
||||||
/* translates from AL coordinate system to quake */
|
/* translates from AL coordinate system to quake */
|
||||||
|
|
|
@ -29,8 +29,8 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "../header/client.h"
|
#include "../header/client.h"
|
||||||
#include "../../backends/generic/header/qal.h"
|
|
||||||
#include "header/local.h"
|
#include "header/local.h"
|
||||||
|
#include "header/qal.h"
|
||||||
#include "header/vorbis.h"
|
#include "header/vorbis.h"
|
||||||
|
|
||||||
/* During registration it is possible to have more sounds
|
/* During registration it is possible to have more sounds
|
||||||
|
|
Loading…
Reference in a new issue