diff --git a/Makefile b/Makefile index d00e4853..59af1b91 100644 --- a/Makefile +++ b/Makefile @@ -252,7 +252,6 @@ CLIENT_OBJS_ := \ src/client/menu/menu.o \ src/client/menu/qmenu.o \ src/client/menu/videomenu.o \ - src/client/sound/qal_api.o \ src/client/sound/snd_al.o \ src/client/sound/snd_dma.o \ src/client/sound/snd_mem.o \ @@ -300,6 +299,7 @@ CLIENT_OBJS_ := \ src/unix/hunk.o \ src/unix/main.o \ src/unix/network.o \ + src/unix/qal.o \ src/unix/signalhandler.o \ src/unix/system.o \ src/unix/vid.o diff --git a/src/client/sound/snd_al.c b/src/client/sound/snd_al.c index f94b4bc3..63718b66 100644 --- a/src/client/sound/snd_al.c +++ b/src/client/sound/snd_al.c @@ -25,8 +25,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifdef USE_OPENAL #include "../header/client.h" +#include "../../unix/header/qal.h" #include "header/local.h" -#include "header/qal_api.h" #include "header/vorbis.h" // translates from AL coordinate system to quake diff --git a/src/client/sound/snd_dma.c b/src/client/sound/snd_dma.c index c52c5d7f..1ae0ec3d 100644 --- a/src/client/sound/snd_dma.c +++ b/src/client/sound/snd_dma.c @@ -27,9 +27,9 @@ */ #include "../header/client.h" +#include "../../unix/header/qal.h" #include "header/local.h" #include "header/vorbis.h" -#include "header/qal_api.h" void S_Play ( void ); void S_SoundList ( void ); diff --git a/src/client/sound/header/qal_api.h b/src/unix/header/qal.h similarity index 99% rename from src/client/sound/header/qal_api.h rename to src/unix/header/qal.h index bdee3ebc..b9d67ce8 100644 --- a/src/client/sound/header/qal_api.h +++ b/src/unix/header/qal.h @@ -26,6 +26,8 @@ * ======================================================================= */ +#ifdef USE_OPENAL + #ifndef _QAL_API_H_ #define _QAL_API_H_ @@ -126,4 +128,5 @@ qboolean QAL_Init(void); void QAL_Shutdown(void); #endif /* _QAL_API_H_ */ +#endif /* USE_OPENAL */ diff --git a/src/client/sound/qal_api.c b/src/unix/qal.c similarity index 99% rename from src/client/sound/qal_api.c rename to src/unix/qal.c index a06b102c..76289fbe 100644 --- a/src/client/sound/qal_api.c +++ b/src/unix/qal.c @@ -29,13 +29,15 @@ * ======================================================================= */ +#ifdef USE_OPENAL + #include #include #include #include -#include "../../common/header/common.h" -#include "header/qal_api.h" +#include "../common/header/common.h" +#include "header/qal.h" static ALCcontext *context; static ALCdevice *device; @@ -483,3 +485,5 @@ QAL_Init() return true; } +#endif /* USE_OPENAL */ +