From 3dba49a1e3bbdb66974bd5fe2a78ba9b84fd629e Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Wed, 15 Jun 2016 07:08:45 +0000 Subject: [PATCH] Replace uses of the HAVE_DS and HAVE_SDL preprocessor macros with MIXERTYPEWIN and MIXERTYPESDL. git-svn-id: https://svn.eduke32.com/eduke32@5780 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/Android.mk | 2 +- polymer/eduke32/Makefile | 4 +--- polymer/eduke32/Makefile.msvc | 2 -- .../Apple/EDuke32.xcodeproj/project.pbxproj | 20 ------------------- .../source/jaudiolib/include/drivers.h | 4 ++-- .../eduke32/source/jaudiolib/src/drivers.c | 8 ++++---- polymer/eduke32/source/jaudiolib/src/fx_man.c | 4 ++-- 7 files changed, 10 insertions(+), 34 deletions(-) diff --git a/polymer/eduke32/Android.mk b/polymer/eduke32/Android.mk index cf291f7be..1b60955f8 100644 --- a/polymer/eduke32/Android.mk +++ b/polymer/eduke32/Android.mk @@ -13,7 +13,7 @@ LOCAL_MODULE := duke3d COMMONFLAGS := -x c++ -std=gnu++11 -fvisibility=hidden -fPIC -funsigned-char -fno-strict-aliasing -pthread \ -W -Wall -Wextra -Wpointer-arith -Wno-char-subscripts -Wno-missing-braces -Wwrite-strings -Wuninitialized \ -Wno-attributes -Wno-strict-overflow -Wno-unused-result -Wlogical-op -Wcast-qual -Werror=return-type \ - -DHAVE_SDL -DHAVE_VORBIS -DHAVE_JWZGLES -DHAVE_ANDROID -DRENDERTYPESDL=1 -DUSE_OPENGL -DNETCODE_DISABLE -DUSE_LIBVPX \ + -DHAVE_VORBIS -DHAVE_JWZGLES -DHAVE_ANDROID -DRENDERTYPESDL=1 -DMIXERTYPESDL=1 -DUSE_OPENGL -DNETCODE_DISABLE -DUSE_LIBVPX \ -DHAVE_INTTYPES -D_GNU_SOURCE=1 -D_REENTRANT ifeq ($(FOUND_CLANG),1) diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile index 92f32b908..d68ef1e95 100644 --- a/polymer/eduke32/Makefile +++ b/polymer/eduke32/Makefile @@ -167,17 +167,15 @@ AUDIOLIB_CFLAGS=-I$(AUDIOLIB_ROOT)/third-party/common/include ifeq ($(PLATFORM),WINDOWS) ifeq ($(MIXERTYPE),WIN) - AUDIOLIB_CFLAGS+= -DHAVE_DS AUDIOLIB_OBJS+= driver_directsound endif endif ifeq ($(MIXERTYPE),SDL) - AUDIOLIB_CFLAGS+= -DHAVE_SDL ifneq ($(PLATFORM),DARWIN) ifneq ($(PLATFORM),WINDOWS) ifneq ($(PLATFORM),WII) - AUDIOLIB_CFLAGS+=`pkg-config --cflags vorbis` + AUDIOLIB_CFLAGS+=`$(PKG_CONFIG) --cflags vorbis` endif endif endif diff --git a/polymer/eduke32/Makefile.msvc b/polymer/eduke32/Makefile.msvc index 1430ebd5a..db415d23c 100644 --- a/polymer/eduke32/Makefile.msvc +++ b/polymer/eduke32/Makefile.msvc @@ -257,12 +257,10 @@ DUKE3D_EDITOR_OBJS=$(DUKE3D_EDITOR_OBJS) $(DUKE3D_OBJ)\build_icon.$o !if ("$(MIXERTYPE)"=="WIN") DUKE3D_OBJS=$(DUKE3D_OBJS) $(DUKE3D_OBJ)\midi.$o $(DUKE3D_OBJ)\music.$o $(DUKE3D_OBJ)\mpu401.$o AUDIOLIB_OBJS=$(AUDIOLIB_OBJS) $(AUDIOLIB_OBJ)\driver_directsound.$o -AUDIOLIB_CFLAGS=$(AUDIOLIB_CFLAGS) /DHAVE_DS !endif !if ("$(MIXERTYPE)"=="SDL") DUKE3D_OBJS=$(DUKE3D_OBJS) $(DUKE3D_OBJ)\sdlmusic.$o AUDIOLIB_OBJS=$(AUDIOLIB_OBJS) $(AUDIOLIB_OBJ)/driver_sdl.$o -AUDIOLIB_CFLAGS=$(AUDIOLIB_CFLAGS) /DHAVE_SDL !endif DUKE3D_OBJS=$(DUKE3D_OBJS) $(MUSICOBJ) diff --git a/polymer/eduke32/platform/Apple/EDuke32.xcodeproj/project.pbxproj b/polymer/eduke32/platform/Apple/EDuke32.xcodeproj/project.pbxproj index 679268a06..6ba5750f8 100644 --- a/polymer/eduke32/platform/Apple/EDuke32.xcodeproj/project.pbxproj +++ b/polymer/eduke32/platform/Apple/EDuke32.xcodeproj/project.pbxproj @@ -2344,7 +2344,6 @@ "-DUSE_OPENGL", "-DPOLYMER", "-DHAS_SOCKLEN_T", - "-DHAVE_SDL", "-DUSING_LTO", "-DNOASM", "-DHAVE_VORBIS", @@ -2459,7 +2458,6 @@ "-DUSE_OPENGL", "-DPOLYMER", "-DHAS_SOCKLEN_T", - "-DHAVE_SDL", "-DUSING_LTO", "-DNOASM", "-DHAVE_VORBIS", @@ -2580,7 +2578,6 @@ "-DUSE_OPENGL", "-DPOLYMER", "-DHAS_SOCKLEN_T", - "-DHAVE_SDL", "-DUSING_LTO", "-DNOASM", "-DHAVE_VORBIS", @@ -2695,7 +2692,6 @@ "-DUSE_OPENGL", "-DPOLYMER", "-DHAS_SOCKLEN_T", - "-DHAVE_SDL", "-DUSING_LTO", "-DNOASM", "-DHAVE_VORBIS", @@ -2807,7 +2803,6 @@ "-DUSE_OPENGL", "-DPOLYMER", "-DHAS_SOCKLEN_T", - "-DHAVE_SDL", "-DUSING_LTO", "-DNOASM", "-DHAVE_VORBIS", @@ -2911,7 +2906,6 @@ "-DUSE_OPENGL", "-DPOLYMER", "-DHAS_SOCKLEN_T", - "-DHAVE_SDL", "-DUSING_LTO", "-DNOASM", "-DHAVE_VORBIS", @@ -3018,7 +3012,6 @@ "-DUSE_OPENGL", "-DPOLYMER", "-DHAS_SOCKLEN_T", - "-DHAVE_SDL", "-DUSING_LTO", "-DNOASM", "-DHAVE_VORBIS", @@ -3119,7 +3112,6 @@ "-DUSE_OPENGL", "-DPOLYMER", "-DHAS_SOCKLEN_T", - "-DHAVE_SDL", "-DUSING_LTO", "-DNOASM", "-DHAVE_VORBIS", @@ -3225,7 +3217,6 @@ "-DUSE_OPENGL", "-DPOLYMER", "-DHAS_SOCKLEN_T", - "-DHAVE_SDL", "-DUSING_LTO", "-DNOASM", "-DHAVE_VORBIS", @@ -3325,7 +3316,6 @@ "-DUSE_OPENGL", "-DPOLYMER", "-DHAS_SOCKLEN_T", - "-DHAVE_SDL", "-DUSING_LTO", "-DNOASM", "-DHAVE_VORBIS", @@ -3464,7 +3454,6 @@ "-DUSE_OPENGL", "-DPOLYMER", "-DHAS_SOCKLEN_T", - "-DHAVE_SDL", "-DUSING_LTO", "-DNOASM", "-DHAVE_VORBIS", @@ -3565,7 +3554,6 @@ "-DUSE_OPENGL", "-DPOLYMER", "-DHAS_SOCKLEN_T", - "-DHAVE_SDL", "-DUSING_LTO", "-DNOASM", "-DHAVE_VORBIS", @@ -3675,7 +3663,6 @@ "-DMIXERTYPESDL=1", "-DUSE_OPENGL", "-DHAVE_JWZGLES", - "-DHAVE_SDL", "-DUSING_LTO", "-DNOASM", "-DNETCODE_DISABLE", @@ -3787,7 +3774,6 @@ "-DMIXERTYPESDL=1", "-DUSE_OPENGL", "-DHAVE_JWZGLES", - "-DHAVE_SDL", "-DUSING_LTO", "-DNOASM", "-DNETCODE_DISABLE", @@ -3899,7 +3885,6 @@ "-DMIXERTYPESDL=1", "-DUSE_OPENGL", "-DHAVE_JWZGLES", - "-DHAVE_SDL", "-DUSING_LTO", "-DNOASM", "-DNETCODE_DISABLE", @@ -4006,7 +3991,6 @@ "-DMIXERTYPESDL=1", "-DUSE_OPENGL", "-DHAVE_JWZGLES", - "-DHAVE_SDL", "-DUSING_LTO", "-DNOASM", "-DNETCODE_DISABLE", @@ -4114,7 +4098,6 @@ "-DMIXERTYPESDL=1", "-DUSE_OPENGL", "-DHAVE_JWZGLES", - "-DHAVE_SDL", "-DUSING_LTO", "-DNOASM", "-DNETCODE_DISABLE", @@ -4218,7 +4201,6 @@ "-DMIXERTYPESDL=1", "-DUSE_OPENGL", "-DHAVE_JWZGLES", - "-DHAVE_SDL", "-DUSING_LTO", "-DNOASM", "-DNETCODE_DISABLE", @@ -4326,7 +4308,6 @@ "-DMIXERTYPESDL=1", "-DUSE_OPENGL", "-DHAVE_JWZGLES", - "-DHAVE_SDL", "-DUSING_LTO", "-DNOASM", "-DNETCODE_DISABLE", @@ -4430,7 +4411,6 @@ "-DMIXERTYPESDL=1", "-DUSE_OPENGL", "-DHAVE_JWZGLES", - "-DHAVE_SDL", "-DUSING_LTO", "-DNOASM", "-DNETCODE_DISABLE", diff --git a/polymer/eduke32/source/jaudiolib/include/drivers.h b/polymer/eduke32/source/jaudiolib/include/drivers.h index 859d7b27e..69fceb5f0 100644 --- a/polymer/eduke32/source/jaudiolib/include/drivers.h +++ b/polymer/eduke32/source/jaudiolib/include/drivers.h @@ -26,9 +26,9 @@ typedef enum { ASS_NoSound, -#if defined HAVE_DS +#if defined MIXERTYPEWIN ASS_DirectSound, -#elif defined HAVE_SDL +#elif defined MIXERTYPESDL ASS_SDL, #endif ASS_NumSoundCards, diff --git a/polymer/eduke32/source/jaudiolib/src/drivers.c b/polymer/eduke32/source/jaudiolib/src/drivers.c index 83fb5c887..f28982846 100644 --- a/polymer/eduke32/source/jaudiolib/src/drivers.c +++ b/polymer/eduke32/source/jaudiolib/src/drivers.c @@ -27,9 +27,9 @@ #include "driver_nosound.h" -#if defined HAVE_DS +#if defined MIXERTYPEWIN # include "driver_directsound.h" -#elif defined HAVE_SDL +#elif defined MIXERTYPESDL # include "driver_sdl.h" #endif @@ -56,14 +56,14 @@ static struct }, // Windows DirectSound -#if defined HAVE_DS +#if defined MIXERTYPEWIN { DirectSoundDrv_GetError, DirectSoundDrv_ErrorString, DirectSoundDrv_PCM_Init, DirectSoundDrv_PCM_Shutdown, DirectSoundDrv_PCM_BeginPlayback, DirectSoundDrv_PCM_StopPlayback, DirectSoundDrv_PCM_Lock, DirectSoundDrv_PCM_Unlock, }, // Simple DirectMedia Layer -#elif defined HAVE_SDL +#elif defined MIXERTYPESDL { SDLDrv_GetError, SDLDrv_ErrorString, SDLDrv_PCM_Init, SDLDrv_PCM_Shutdown, SDLDrv_PCM_BeginPlayback, SDLDrv_PCM_StopPlayback, SDLDrv_PCM_Lock, SDLDrv_PCM_Unlock, diff --git a/polymer/eduke32/source/jaudiolib/src/fx_man.c b/polymer/eduke32/source/jaudiolib/src/fx_man.c index b64488c84..eb7701133 100644 --- a/polymer/eduke32/source/jaudiolib/src/fx_man.c +++ b/polymer/eduke32/source/jaudiolib/src/fx_man.c @@ -82,9 +82,9 @@ int32_t FX_Init(int32_t SoundCard, int32_t numvoices, int32_t numchannels, unsig if (SoundCard == ASS_AutoDetect) { -#if defined HAVE_DS +#if defined MIXERTYPEWIN SoundCard = ASS_DirectSound; -#elif defined HAVE_SDL +#elif defined MIXERTYPESDL SoundCard = ASS_SDL; #else #warning No sound driver selected!