tech
/
engine
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Eukara 2018-01-23 03:00:45 +00:00
parent 4c0f3ede74
commit 922b0ca2bb
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engine/client/snd_sdl.c
View File

@ -1,4 +1,6 @@
#include "quakedef.h" #include "quakedef.h"
#ifdef HAVE_MIXER
#include "winquake.h" #include "winquake.h"
#ifdef DYNAMIC_SDL #ifdef DYNAMIC_SDL
@ -440,3 +442,4 @@ snd_capture_driver_t SDL_Capture =
SDL_Capture_Shutdown SDL_Capture_Shutdown
}; };
#endif #endif
#endif

9
engine/common/config_wastes.h
View File

@ -24,7 +24,9 @@
//#define D3D9QUAKE //#define D3D9QUAKE
//#define GLQUAKE //#define GLQUAKE
#undef D3D11QUAKE #undef D3D11QUAKE
#if defined(WIN32)
#define D3D8QUAKE #define D3D8QUAKE
#endif
#undef VKQUAKE #undef VKQUAKE
#undef HEADLESSQUAKE #undef HEADLESSQUAKE
@ -39,7 +41,7 @@
#define MENU_DAT #define MENU_DAT
#define PSET_SCRIPT #define PSET_SCRIPT
#define VOICECHAT #define VOICECHAT
#define RTLIGHTS #undef RTLIGHTS
#ifndef MULTITHREAD #ifndef MULTITHREAD
#define MULTITHREAD //misc basic multithreading - dsound, downloads, basic stuff that's unlikely to have race conditions. #define MULTITHREAD //misc basic multithreading - dsound, downloads, basic stuff that's unlikely to have race conditions.
#endif #endif
@ -64,7 +66,7 @@
#define Q3BSPS #define Q3BSPS
#undef Q1BSPS #undef Q1BSPS
#undef Q2BSPS #undef Q2BSPS
#define RFBSPS //qfusion's bsp format / jk2o etc. #undef RFBSPS //qfusion's bsp format / jk2o etc.
#undef TERRAIN #undef TERRAIN
#undef DOOMWADS #undef DOOMWADS
#undef MAP_PROC #undef MAP_PROC
@ -124,9 +126,6 @@
#undef HAVE_MEDIA_ENCODER //capture/capturedemo work. #undef HAVE_MEDIA_ENCODER //capture/capturedemo work.
#undef HAVE_SPEECHTOTEXT //windows speech-to-text thing #undef HAVE_SPEECHTOTEXT //windows speech-to-text thing
#ifdef COMPILE_OPTS #ifdef COMPILE_OPTS
//things to configure qclib, which annoyingly doesn't include this file itself //things to configure qclib, which annoyingly doesn't include this file itself
-DOMIT_QCC //disable the built-in qcc -DOMIT_QCC //disable the built-in qcc