From 922b0ca2bb324565ea852806d065b4fe7fb06d8e Mon Sep 17 00:00:00 2001 From: Eukara Date: Tue, 23 Jan 2018 03:00:45 +0000 Subject: [PATCH] Fixes for The Wastes compilation under Linux. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5204 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/snd_sdl.c | 3 +++ engine/common/config_wastes.h | 9 ++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/engine/client/snd_sdl.c b/engine/client/snd_sdl.c index fe07722cb..a64c4506f 100644 --- a/engine/client/snd_sdl.c +++ b/engine/client/snd_sdl.c @@ -1,4 +1,6 @@ #include "quakedef.h" + +#ifdef HAVE_MIXER #include "winquake.h" #ifdef DYNAMIC_SDL @@ -440,3 +442,4 @@ snd_capture_driver_t SDL_Capture = SDL_Capture_Shutdown }; #endif +#endif diff --git a/engine/common/config_wastes.h b/engine/common/config_wastes.h index edfbbd99d..9224aaa67 100644 --- a/engine/common/config_wastes.h +++ b/engine/common/config_wastes.h @@ -24,7 +24,9 @@ //#define D3D9QUAKE //#define GLQUAKE #undef D3D11QUAKE +#if defined(WIN32) #define D3D8QUAKE +#endif #undef VKQUAKE #undef HEADLESSQUAKE @@ -39,7 +41,7 @@ #define MENU_DAT #define PSET_SCRIPT #define VOICECHAT -#define RTLIGHTS +#undef RTLIGHTS #ifndef MULTITHREAD #define MULTITHREAD //misc basic multithreading - dsound, downloads, basic stuff that's unlikely to have race conditions. #endif @@ -64,7 +66,7 @@ #define Q3BSPS #undef Q1BSPS #undef Q2BSPS -#define RFBSPS //qfusion's bsp format / jk2o etc. +#undef RFBSPS //qfusion's bsp format / jk2o etc. #undef TERRAIN #undef DOOMWADS #undef MAP_PROC @@ -124,9 +126,6 @@ #undef HAVE_MEDIA_ENCODER //capture/capturedemo work. #undef HAVE_SPEECHTOTEXT //windows speech-to-text thing - - - #ifdef COMPILE_OPTS //things to configure qclib, which annoyingly doesn't include this file itself -DOMIT_QCC //disable the built-in qcc