Kill NOHS
(cherry picked from commit 3437b0690a3f4278e3ecc657102a126a3e2f3d13)
This commit is contained in:
parent
2aab765b36
commit
6c2370f894
23
src/Makefile
23
src/Makefile
|
@ -62,7 +62,6 @@
|
||||||
# Generate compiler errors for most compiler warnings, add 'ERRORMODE=1'
|
# Generate compiler errors for most compiler warnings, add 'ERRORMODE=1'
|
||||||
# Compile without NASM's tmap.nas, add 'NOASM=1'
|
# Compile without NASM's tmap.nas, add 'NOASM=1'
|
||||||
# Compile without 3D hardware support, add 'NOHW=1'
|
# Compile without 3D hardware support, add 'NOHW=1'
|
||||||
# Compile without 3D sound support, add 'NOHS=1'
|
|
||||||
# Compile with GDBstubs, add 'RDB=1'
|
# Compile with GDBstubs, add 'RDB=1'
|
||||||
# Compile without PNG, add 'NOPNG=1'
|
# Compile without PNG, add 'NOPNG=1'
|
||||||
# Compile without zlib, add 'NOZLIB=1'
|
# Compile without zlib, add 'NOZLIB=1'
|
||||||
|
@ -174,7 +173,6 @@ NOPNG=1
|
||||||
NOZLIB=1
|
NOZLIB=1
|
||||||
NONET=1
|
NONET=1
|
||||||
NOHW=1
|
NOHW=1
|
||||||
NOHS=1
|
|
||||||
NOASM=1
|
NOASM=1
|
||||||
NOIPX=1
|
NOIPX=1
|
||||||
EXENAME?=srb2dummy
|
EXENAME?=srb2dummy
|
||||||
|
@ -196,7 +194,6 @@ endif
|
||||||
ifdef PANDORA
|
ifdef PANDORA
|
||||||
NONX86=1
|
NONX86=1
|
||||||
NOHW=1
|
NOHW=1
|
||||||
NOHS=1
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef DJGPPDOS
|
ifdef DJGPPDOS
|
||||||
|
@ -281,13 +278,6 @@ else
|
||||||
$(OBJDIR)/hw_md2load.o $(OBJDIR)/hw_md3load.o $(OBJDIR)/hw_model.o $(OBJDIR)/u_list.o $(OBJDIR)/hw_batching.o
|
$(OBJDIR)/hw_md2load.o $(OBJDIR)/hw_md3load.o $(OBJDIR)/hw_model.o $(OBJDIR)/u_list.o $(OBJDIR)/hw_batching.o
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef NOHS
|
|
||||||
OPTS+=-DNOHS
|
|
||||||
else
|
|
||||||
OPTS+=-DHW3SOUND
|
|
||||||
OBJS+=$(OBJDIR)/hw3sound.o
|
|
||||||
endif
|
|
||||||
|
|
||||||
OPTS += -DCOMPVERSION
|
OPTS += -DCOMPVERSION
|
||||||
|
|
||||||
ifndef NONX86
|
ifndef NONX86
|
||||||
|
@ -802,19 +792,6 @@ $(OBJDIR)/ogl_win.o: hardware/r_opengl/ogl_win.c hardware/r_opengl/r_opengl.h \
|
||||||
$(CC) $(CFLAGS) $(WFLAGS) -D_WINDOWS -mwindows -c $< -o $@
|
$(CC) $(CFLAGS) $(WFLAGS) -D_WINDOWS -mwindows -c $< -o $@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifndef NOHS
|
|
||||||
$(OBJDIR)/s_ds3d.o: hardware/s_ds3d/s_ds3d.c hardware/hw3dsdrv.h \
|
|
||||||
hardware/hw_dll.h
|
|
||||||
$(CC) $(ARCHOPTS) -Os -o $(OBJDIR)/s_ds3d.o $(WFLAGS) -D_WINDOWS -mwindows -c hardware/s_ds3d/s_ds3d.c
|
|
||||||
|
|
||||||
$(OBJDIR)/s_fmod.o: hardware/s_openal/s_openal.c hardware/hw3dsdrv.h \
|
|
||||||
hardware/hw_dll.h
|
|
||||||
$(CC) $(ARCHOPTS) -Os -o $(OBJDIR)/s_fmod.o $(WFLAGS) -D_WINDOWS -mwindows -c hardware/s_fmod/s_fmod.c
|
|
||||||
|
|
||||||
$(OBJDIR)/s_openal.o: hardware/s_openal/s_openal.c hardware/hw3dsdrv.h \
|
|
||||||
hardware/hw_dll.h
|
|
||||||
$(CC) $(ARCHOPTS) -Os -o $(OBJDIR)/s_openal.o $(WFLAGS) -D_WINDOWS -mwindows -c hardware/s_openal/s_openal.c
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,6 @@
|
||||||
// Use Mixer interface?
|
// Use Mixer interface?
|
||||||
#ifdef HAVE_MIXER
|
#ifdef HAVE_MIXER
|
||||||
#define SOUND SOUND_MIXER
|
#define SOUND SOUND_MIXER
|
||||||
#define NOHS // No HW3SOUND
|
|
||||||
#ifdef HW3SOUND
|
#ifdef HW3SOUND
|
||||||
#undef HW3SOUND
|
#undef HW3SOUND
|
||||||
#endif
|
#endif
|
||||||
|
@ -45,7 +44,6 @@
|
||||||
// Use FMOD?
|
// Use FMOD?
|
||||||
#ifdef HAVE_FMOD
|
#ifdef HAVE_FMOD
|
||||||
#define SOUND SOUND_FMOD
|
#define SOUND SOUND_FMOD
|
||||||
#define NOHS // No HW3SOUND
|
|
||||||
#ifdef HW3SOUND
|
#ifdef HW3SOUND
|
||||||
#undef HW3SOUND
|
#undef HW3SOUND
|
||||||
#endif
|
#endif
|
||||||
|
@ -62,10 +60,6 @@
|
||||||
#if !defined (HWRENDER) && !defined (NOHW)
|
#if !defined (HWRENDER) && !defined (NOHW)
|
||||||
#define HWRENDER
|
#define HWRENDER
|
||||||
#endif
|
#endif
|
||||||
// judgecutor: 3D sound support
|
|
||||||
#if !defined(HW3SOUND) && !defined (NOHS)
|
|
||||||
#define HW3SOUND
|
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
|
|
|
@ -53,28 +53,6 @@ ifndef NOHW
|
||||||
OBJS+=$(OBJDIR)/r_opengl.o $(OBJDIR)/ogl_sdl.o
|
OBJS+=$(OBJDIR)/r_opengl.o $(OBJDIR)/ogl_sdl.o
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifndef NOHS
|
|
||||||
ifdef OPENAL
|
|
||||||
OBJS+=$(OBJDIR)/s_openal.o
|
|
||||||
OPTS+=-DSTATIC3DS
|
|
||||||
STATICHS=1
|
|
||||||
else
|
|
||||||
ifdef FMOD
|
|
||||||
OBJS+=$(OBJDIR)/s_fmod.o
|
|
||||||
OPTS+=-DSTATIC3DS
|
|
||||||
STATICHS=1
|
|
||||||
else
|
|
||||||
ifdef MINGW
|
|
||||||
ifdef DS3D
|
|
||||||
OBJS+=$(OBJDIR)/s_ds3d.o
|
|
||||||
OPTS+=-DSTATIC3DS
|
|
||||||
STATICHS=1
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef NOMIXER
|
ifdef NOMIXER
|
||||||
i_sound_o=$(OBJDIR)/sdl_sound.o
|
i_sound_o=$(OBJDIR)/sdl_sound.o
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue