Make engoo run on X11 Linux
This commit is contained in:
eukos
parent
59493a3e76
commit
da1840d6a0
7 changed files with 972 additions and 203 deletions
491
WinQuake/Makefile
Normal file
491
WinQuake/Makefile
Normal file
|
|
@ -0,0 +1,491 @@
|
|||
#
|
||||
# Quake Makefile for Linux 2.0
|
||||
#
|
||||
# Aug '98 by Zoid <zoid@idsoftware.com>
|
||||
#
|
||||
# ELF only
|
||||
#
|
||||
# ============================
|
||||
#
|
||||
# Quake X11 Makefile for Linux
|
||||
#
|
||||
# Jul 2015 by eukara <eukos@oldtimes-software.com>
|
||||
#
|
||||
|
||||
BASEVERSION=1.09
|
||||
VERSION=$(BASEVERSION)$(GLIBC)
|
||||
|
||||
ifneq (,$(findstring libc6,$(shell if [ -e /lib/libc.so.6 ];then echo libc6;fi)))
|
||||
GLIBC=-glibc
|
||||
else
|
||||
GLIBC=
|
||||
endif
|
||||
|
||||
ifneq (,$(findstring alpha,$(shell uname -m)))
|
||||
ARCH=axp
|
||||
else
|
||||
ARCH=i386
|
||||
endif
|
||||
NOARCH=noarch
|
||||
|
||||
MOUNT_DIR=./
|
||||
MASTER_DIR=./
|
||||
|
||||
BUILD_DEBUG_DIR=debug
|
||||
BUILD_RELEASE_DIR=release
|
||||
|
||||
CC=gcc -m32
|
||||
|
||||
BASE_CFLAGS=-Dstricmp=strcasecmp
|
||||
RELEASE_CFLAGS=$(BASE_CFLAGS)
|
||||
DEBUG_CFLAGS=$(BASE_CFLAGS) -g
|
||||
LDFLAGS=-lm -ldl
|
||||
XLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga
|
||||
XCFLAGS=-DX11
|
||||
|
||||
DO_CC=$(CC) $(CFLAGS) -o $@ -c $<
|
||||
DO_DEBUG_CC=$(CC) $(DEBUG_CFLAGS) -o $@ -c $<
|
||||
DO_GL_CC=$(CC) $(CFLAGS) $(GLCFLAGS) -o $@ -c $<
|
||||
DO_GL_DEBUG_CC=$(CC) $(DEBUG_CFLAGS) $(GLCFLAGS) -o $@ -c $<
|
||||
DO_X11_CC=$(CC) $(CFLAGS) $(XCFLAGS) -o $@ -c $<
|
||||
DO_X11_DEBUG_CC=$(CC) $(DEBUG_CFLAGS) $(XCFLAGS) -o $@ -c $<
|
||||
DO_O_CC=$(CC) -O $(CFLAGS) -o $@ -c $<
|
||||
DO_AS=$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
|
||||
DO_GL_AS=$(CC) $(CFLAGS) $(GLCFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
|
||||
|
||||
#############################################################################
|
||||
# SETUP AND BUILD
|
||||
#############################################################################
|
||||
|
||||
TARGETS=$(BUILDDIR)/engoo.x11
|
||||
|
||||
build_debug:
|
||||
@-mkdir $(BUILD_DEBUG_DIR) \
|
||||
$(BUILD_DEBUG_DIR)/obj
|
||||
$(MAKE) targets BUILDDIR=$(BUILD_DEBUG_DIR) CFLAGS="$(DEBUG_CFLAGS)"
|
||||
|
||||
build_release:
|
||||
@-mkdir $(BUILD_RELEASE_DIR) \
|
||||
$(BUILD_RELEASE_DIR)/obj
|
||||
$(MAKE) targets BUILDDIR=$(BUILD_RELEASE_DIR) CFLAGS="$(RELEASE_CFLAGS)"
|
||||
|
||||
all: build_debug build_release
|
||||
|
||||
targets: $(TARGETS)
|
||||
|
||||
#############################################################################
|
||||
# X11 Quake
|
||||
#############################################################################
|
||||
|
||||
X11_OBJS = \
|
||||
$(BUILDDIR)/obj/cl_demo.o \
|
||||
$(BUILDDIR)/obj/cl_input.o \
|
||||
$(BUILDDIR)/obj/cl_main.o \
|
||||
$(BUILDDIR)/obj/cl_parse.o \
|
||||
$(BUILDDIR)/obj/cl_tent.o \
|
||||
$(BUILDDIR)/obj/chase.o \
|
||||
$(BUILDDIR)/obj/cmd.o \
|
||||
$(BUILDDIR)/obj/common.o \
|
||||
$(BUILDDIR)/obj/console.o \
|
||||
$(BUILDDIR)/obj/crc.o \
|
||||
$(BUILDDIR)/obj/cvar.o \
|
||||
$(BUILDDIR)/obj/draw.o \
|
||||
$(BUILDDIR)/obj/d_edge.o \
|
||||
$(BUILDDIR)/obj/d_fill.o \
|
||||
$(BUILDDIR)/obj/d_init.o \
|
||||
$(BUILDDIR)/obj/d_modech.o \
|
||||
$(BUILDDIR)/obj/d_part.o \
|
||||
$(BUILDDIR)/obj/d_polyse.o \
|
||||
$(BUILDDIR)/obj/d_scan.o \
|
||||
$(BUILDDIR)/obj/d_sky.o \
|
||||
$(BUILDDIR)/obj/d_sprite.o \
|
||||
$(BUILDDIR)/obj/d_surf.o \
|
||||
$(BUILDDIR)/obj/d_vars.o \
|
||||
$(BUILDDIR)/obj/d_zpoint.o \
|
||||
$(BUILDDIR)/obj/host.o \
|
||||
$(BUILDDIR)/obj/host_cmd.o \
|
||||
$(BUILDDIR)/obj/keys.o \
|
||||
$(BUILDDIR)/obj/menu.o \
|
||||
$(BUILDDIR)/obj/mathlib.o \
|
||||
$(BUILDDIR)/obj/model.o \
|
||||
$(BUILDDIR)/obj/model_common.o \
|
||||
$(BUILDDIR)/obj/net_dgrm.o \
|
||||
$(BUILDDIR)/obj/net_loop.o \
|
||||
$(BUILDDIR)/obj/net_main.o \
|
||||
$(BUILDDIR)/obj/net_vcr.o \
|
||||
$(BUILDDIR)/obj/net_udp.o \
|
||||
$(BUILDDIR)/obj/net_bsd.o \
|
||||
$(BUILDDIR)/obj/nonintel.o \
|
||||
$(BUILDDIR)/obj/pr_cmds.o \
|
||||
$(BUILDDIR)/obj/pr_edict.o \
|
||||
$(BUILDDIR)/obj/pr_exec.o \
|
||||
$(BUILDDIR)/obj/r_aclip.o \
|
||||
$(BUILDDIR)/obj/r_alias.o \
|
||||
$(BUILDDIR)/obj/r_bsp.o \
|
||||
$(BUILDDIR)/obj/r_light.o \
|
||||
$(BUILDDIR)/obj/r_draw.o \
|
||||
$(BUILDDIR)/obj/r_efrag.o \
|
||||
$(BUILDDIR)/obj/r_edge.o \
|
||||
$(BUILDDIR)/obj/r_misc.o \
|
||||
$(BUILDDIR)/obj/r_main.o \
|
||||
$(BUILDDIR)/obj/r_sky.o \
|
||||
$(BUILDDIR)/obj/r_sprite.o \
|
||||
$(BUILDDIR)/obj/r_surf.o \
|
||||
$(BUILDDIR)/obj/r_part.o \
|
||||
$(BUILDDIR)/obj/r_vars.o \
|
||||
$(BUILDDIR)/obj/screen.o \
|
||||
$(BUILDDIR)/obj/sbar.o \
|
||||
$(BUILDDIR)/obj/sv_main.o \
|
||||
$(BUILDDIR)/obj/sv_phys.o \
|
||||
$(BUILDDIR)/obj/sv_move.o \
|
||||
$(BUILDDIR)/obj/sv_user.o \
|
||||
$(BUILDDIR)/obj/zone.o \
|
||||
$(BUILDDIR)/obj/view.o \
|
||||
$(BUILDDIR)/obj/wad.o \
|
||||
$(BUILDDIR)/obj/world.o \
|
||||
$(BUILDDIR)/obj/cd_linux.o \
|
||||
$(BUILDDIR)/obj/sys_linux.o \
|
||||
$(BUILDDIR)/obj/vid_x.o \
|
||||
$(BUILDDIR)/obj/snd_dma.o \
|
||||
$(BUILDDIR)/obj/snd_mem.o \
|
||||
$(BUILDDIR)/obj/snd_mix.o \
|
||||
$(BUILDDIR)/obj/snd_linux.o \
|
||||
$(BUILDDIR)/obj/bot.o \
|
||||
$(BUILDDIR)/obj/nvs_client.o \
|
||||
$(BUILDDIR)/obj/nvs_common.o \
|
||||
$(BUILDDIR)/obj/nvs_server.o \
|
||||
$(BUILDDIR)/obj/nvs_server_data.o \
|
||||
\
|
||||
$(BUILDDIR)/obj/d_draw.o \
|
||||
$(BUILDDIR)/obj/d_draw16.o \
|
||||
$(BUILDDIR)/obj/d_parta.o \
|
||||
$(BUILDDIR)/obj/d_polysa.o \
|
||||
$(BUILDDIR)/obj/d_scana.o \
|
||||
$(BUILDDIR)/obj/d_spr8.o \
|
||||
$(BUILDDIR)/obj/d_varsa.o \
|
||||
$(BUILDDIR)/obj/math.o \
|
||||
$(BUILDDIR)/obj/r_aliasa.o \
|
||||
$(BUILDDIR)/obj/r_drawa.o \
|
||||
$(BUILDDIR)/obj/r_edgea.o \
|
||||
$(BUILDDIR)/obj/r_varsa.o \
|
||||
$(BUILDDIR)/obj/surf16.o \
|
||||
$(BUILDDIR)/obj/surf8.o \
|
||||
$(BUILDDIR)/obj/surf8fst.o \
|
||||
$(BUILDDIR)/obj/worlda.o \
|
||||
$(BUILDDIR)/obj/r_aclipa.o \
|
||||
$(BUILDDIR)/obj/snd_mixa.o \
|
||||
$(BUILDDIR)/obj/sys_dosa.o
|
||||
|
||||
$(BUILDDIR)/engoo.x11 : $(X11_OBJS)
|
||||
$(CC) $(CFLAGS) -o $@ $(X11_OBJS) $(XLDFLAGS) $(LDFLAGS)
|
||||
|
||||
####
|
||||
|
||||
$(BUILDDIR)/obj/cl_demo.o : $(MOUNT_DIR)/cl_demo.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/cl_input.o : $(MOUNT_DIR)/cl_input.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/cl_main.o : $(MOUNT_DIR)/cl_main.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/cl_parse.o : $(MOUNT_DIR)/cl_parse.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/cl_tent.o : $(MOUNT_DIR)/cl_tent.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/chase.o : $(MOUNT_DIR)/chase.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/cmd.o : $(MOUNT_DIR)/cmd.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/common.o : $(MOUNT_DIR)/common.c
|
||||
$(DO_X11_DEBUG_CC)
|
||||
|
||||
$(BUILDDIR)/obj/console.o : $(MOUNT_DIR)/console.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/crc.o : $(MOUNT_DIR)/crc.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/cvar.o : $(MOUNT_DIR)/cvar.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/draw.o : $(MOUNT_DIR)/draw.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/d_edge.o : $(MOUNT_DIR)/d_edge.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/d_fill.o : $(MOUNT_DIR)/d_fill.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/d_init.o : $(MOUNT_DIR)/d_init.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/d_modech.o : $(MOUNT_DIR)/d_modech.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/d_part.o : $(MOUNT_DIR)/d_part.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/d_polyse.o : $(MOUNT_DIR)/d_polyse.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/d_scan.o : $(MOUNT_DIR)/d_scan.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/d_sky.o : $(MOUNT_DIR)/d_sky.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/d_sprite.o : $(MOUNT_DIR)/d_sprite.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/d_surf.o : $(MOUNT_DIR)/d_surf.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/d_vars.o : $(MOUNT_DIR)/d_vars.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/d_zpoint.o : $(MOUNT_DIR)/d_zpoint.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/host.o : $(MOUNT_DIR)/host.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/host_cmd.o : $(MOUNT_DIR)/host_cmd.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/keys.o : $(MOUNT_DIR)/keys.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/menu.o : $(MOUNT_DIR)/menu.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/mathlib.o : $(MOUNT_DIR)/mathlib.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/model.o : $(MOUNT_DIR)/model.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/model_common.o :$(MOUNT_DIR)/model_common.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/net_dgrm.o : $(MOUNT_DIR)/net_dgrm.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/net_loop.o : $(MOUNT_DIR)/net_loop.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/net_main.o : $(MOUNT_DIR)/net_main.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/net_vcr.o : $(MOUNT_DIR)/net_vcr.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/net_udp.o : $(MOUNT_DIR)/net_udp.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/net_bsd.o : $(MOUNT_DIR)/net_bsd.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/nonintel.o : $(MOUNT_DIR)/nonintel.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/pr_cmds.o : $(MOUNT_DIR)/pr_cmds.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/pr_edict.o : $(MOUNT_DIR)/pr_edict.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/pr_exec.o : $(MOUNT_DIR)/pr_exec.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/r_aclip.o : $(MOUNT_DIR)/r_aclip.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/r_alias.o : $(MOUNT_DIR)/r_alias.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/r_bsp.o : $(MOUNT_DIR)/r_bsp.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/r_light.o : $(MOUNT_DIR)/r_light.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/r_draw.o : $(MOUNT_DIR)/r_draw.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/r_efrag.o : $(MOUNT_DIR)/r_efrag.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/r_edge.o : $(MOUNT_DIR)/r_edge.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/r_misc.o : $(MOUNT_DIR)/r_misc.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/r_main.o : $(MOUNT_DIR)/r_main.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/r_sky.o : $(MOUNT_DIR)/r_sky.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/r_sprite.o : $(MOUNT_DIR)/r_sprite.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/r_surf.o : $(MOUNT_DIR)/r_surf.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/r_part.o : $(MOUNT_DIR)/r_part.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/r_vars.o : $(MOUNT_DIR)/r_vars.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/screen.o : $(MOUNT_DIR)/screen.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/sbar.o : $(MOUNT_DIR)/sbar.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/sv_main.o : $(MOUNT_DIR)/sv_main.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/sv_phys.o : $(MOUNT_DIR)/sv_phys.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/sv_move.o : $(MOUNT_DIR)/sv_move.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/sv_user.o : $(MOUNT_DIR)/sv_user.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/zone.o : $(MOUNT_DIR)/zone.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/view.o : $(MOUNT_DIR)/view.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/wad.o : $(MOUNT_DIR)/wad.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/world.o : $(MOUNT_DIR)/world.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/cd_linux.o : $(MOUNT_DIR)/cd_linux.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/sys_linux.o :$(MOUNT_DIR)/sys_linux.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/vid_x.o: $(MOUNT_DIR)/vid_x.c
|
||||
$(DO_O_CC)
|
||||
|
||||
$(BUILDDIR)/obj/snd_dma.o : $(MOUNT_DIR)/snd_dma.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/snd_mem.o : $(MOUNT_DIR)/snd_mem.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/snd_mix.o : $(MOUNT_DIR)/snd_mix.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/snd_linux.o :$(MOUNT_DIR)/snd_linux.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/bot.o :$(MOUNT_DIR)/bot.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/nvs_client.o :$(MOUNT_DIR)/nvs_client.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/nvs_common.o :$(MOUNT_DIR)/nvs_common.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/nvs_server.o :$(MOUNT_DIR)/nvs_server.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
$(BUILDDIR)/obj/nvs_server_data.o :$(MOUNT_DIR)/nvs_server_data.c
|
||||
$(DO_X11_CC)
|
||||
|
||||
|
||||
#####
|
||||
|
||||
$(BUILDDIR)/obj/d_copy.o : $(MOUNT_DIR)/../asm/d_copy.s
|
||||
$(DO_AS)
|
||||
|
||||
$(BUILDDIR)/obj/d_draw.o : $(MOUNT_DIR)/../asm/d_draw.s
|
||||
$(DO_AS)
|
||||
|
||||
$(BUILDDIR)/obj/d_draw16.o : $(MOUNT_DIR)/../asm/d_draw16.s
|
||||
$(DO_AS)
|
||||
|
||||
$(BUILDDIR)/obj/d_parta.o : $(MOUNT_DIR)/../asm/d_parta.s
|
||||
$(DO_AS)
|
||||
|
||||
$(BUILDDIR)/obj/d_polysa.o : $(MOUNT_DIR)/../asm/d_polysa.s
|
||||
$(DO_AS)
|
||||
|
||||
$(BUILDDIR)/obj/d_scana.o : $(MOUNT_DIR)/../asm/d_scana.s
|
||||
$(DO_AS)
|
||||
|
||||
$(BUILDDIR)/obj/d_spr8.o : $(MOUNT_DIR)/../asm/d_spr8.s
|
||||
$(DO_AS)
|
||||
|
||||
$(BUILDDIR)/obj/d_varsa.o : $(MOUNT_DIR)/../asm/d_varsa.s
|
||||
$(DO_AS)
|
||||
|
||||
$(BUILDDIR)/obj/math.o : $(MOUNT_DIR)/../asm/math.s
|
||||
$(DO_AS)
|
||||
|
||||
$(BUILDDIR)/obj/r_aliasa.o : $(MOUNT_DIR)/../asm/r_aliasa.s
|
||||
$(DO_AS)
|
||||
|
||||
$(BUILDDIR)/obj/r_drawa.o : $(MOUNT_DIR)/../asm/r_drawa.s
|
||||
$(DO_AS)
|
||||
|
||||
$(BUILDDIR)/obj/r_edgea.o : $(MOUNT_DIR)/../asm/r_edgea.s
|
||||
$(DO_AS)
|
||||
|
||||
$(BUILDDIR)/obj/r_varsa.o : $(MOUNT_DIR)/../asm/r_varsa.s
|
||||
$(DO_AS)
|
||||
|
||||
$(BUILDDIR)/obj/surf16.o : $(MOUNT_DIR)/../asm/surf16.s
|
||||
$(DO_AS)
|
||||
|
||||
$(BUILDDIR)/obj/surf8.o : $(MOUNT_DIR)/../asm/surf8.s
|
||||
$(DO_AS)
|
||||
|
||||
$(BUILDDIR)/obj/surf8fst.o : $(MOUNT_DIR)/../asm/surf8fst.s
|
||||
$(DO_AS)
|
||||
|
||||
$(BUILDDIR)/obj/worlda.o : $(MOUNT_DIR)/../asm/worlda.s
|
||||
$(DO_AS)
|
||||
|
||||
$(BUILDDIR)/obj/r_aclipa.o : $(MOUNT_DIR)/../asm/r_aclipa.s
|
||||
$(DO_AS)
|
||||
|
||||
$(BUILDDIR)/obj/snd_mixa.o : $(MOUNT_DIR)/../asm/snd_mixa.s
|
||||
$(DO_AS)
|
||||
|
||||
$(BUILDDIR)/obj/sys_dosa.o : $(MOUNT_DIR)/../asm/sys_dosa.s
|
||||
$(DO_AS)
|
||||
|
||||
#############################################################################
|
||||
# MISC
|
||||
#############################################################################
|
||||
|
||||
clean: clean-debug clean-release
|
||||
|
||||
clean-debug:
|
||||
$(MAKE) clean2 BUILDDIR=$(BUILD_DEBUG_DIR) CFLAGS="$(DEBUG_CFLAGS)"
|
||||
|
||||
clean-release:
|
||||
$(MAKE) clean2 BUILDDIR=$(BUILD_RELEASE_DIR) CFLAGS="$(DEBUG_CFLAGS)"
|
||||
|
||||
clean2:
|
||||
-rm -f $(X11_OBJS)
|
||||
|
|
@ -88,8 +88,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
// -----------------------------------------
|
||||
|
||||
//#define DUMB // Use DUMB Module playback library *WIP*
|
||||
#ifndef linux
|
||||
#define ASS_MIDI // Use Apogee Sound System for MIDI playback only*WIP*
|
||||
|
||||
#endif
|
||||
int inthedos;
|
||||
|
||||
|
||||
|
|
@ -604,4 +605,4 @@ extern musicinfo_t S_music[];
|
|||
typedef unsigned char UBYTE; // a one-byte int
|
||||
typedef unsigned short UWORD; // a two-byte int
|
||||
//typedef unsigned int ULONG; // a four-byte int (assumes int 4 bytes)
|
||||
typedef unsigned int OOLONG; // a four-byte int (assumes int 4 bytes)
|
||||
typedef unsigned int OOLONG; // a four-byte int (assumes int 4 bytes)
|
||||
|
|
|
|||
|
|
@ -609,8 +609,11 @@ void R_ViewChanged (vrect_t *pvrect, int lineadj, float aspect)
|
|||
float res_scale;
|
||||
|
||||
r_viewchanged = true;
|
||||
#ifndef linux
|
||||
lineadj *= (vid.conheight / vid.vconheight); // leilei - PLEASE FIX ME HERE!
|
||||
// R_SetVrect (pvrect, &r_refdef.vrect, lineadj);
|
||||
#else
|
||||
R_SetVrect (pvrect, &r_refdef.vrect, lineadj);
|
||||
#endif
|
||||
|
||||
|
||||
r_refdef.horizontalFieldOfView = 2.0 * tan (r_refdef.fov_x/360*M_PI);
|
||||
|
|
|
|||
|
|
@ -268,13 +268,13 @@ void Sbar_DontShowScores (void)
|
|||
|
||||
void Sbar_Colors (void)
|
||||
{
|
||||
|
||||
#ifndef linux // eukara - FIX ME, segfaults
|
||||
// leilei - update
|
||||
col_sbar = sbcolor_sbar->value;
|
||||
col_ibar = sbcolor_ibar->value;
|
||||
col_toremap = sbcolor_remap1->value;
|
||||
col_toremap2 = sbcolor_remap2->value;
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -27,233 +27,468 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
#include <sys/wait.h>
|
||||
#include <linux/soundcard.h>
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
#include "quakedef.h"
|
||||
#define Q_strcpy(dest, src, size) Q_strncpy((dest), (size), (src), Q_MAXINT)
|
||||
#ifndef SNDCTL_DSP_COOKEDMODE
|
||||
# define SNDCTL_DSP_COOKEDMODE _SIOW ('P', 30, int)
|
||||
#endif
|
||||
|
||||
int audio_fd;
|
||||
int snd_inited;
|
||||
|
||||
static int tryrates[] = { 11025, 22051, 44100, 8000 };
|
||||
|
||||
qboolean SNDDMA_Init(void)
|
||||
int Q_strncpy (char *dest, int bufsize, const char *src, int count)
|
||||
{
|
||||
char *start = dest;
|
||||
|
||||
int rc;
|
||||
int fmt;
|
||||
int tmp;
|
||||
int i;
|
||||
char *s;
|
||||
struct audio_buf_info info;
|
||||
int caps;
|
||||
// if (bufsize-1 < count)
|
||||
// count = bufsize-1;
|
||||
|
||||
snd_inited = 0;
|
||||
|
||||
// open /dev/dsp, confirm capability to mmap, and get size of dma buffer
|
||||
|
||||
audio_fd = open("/dev/dsp", O_RDWR);
|
||||
if (audio_fd < 0)
|
||||
{
|
||||
perror("/dev/dsp");
|
||||
Con_Printf("Could not open /dev/dsp\n");
|
||||
if (bufsize <= 0)
|
||||
return 0;
|
||||
|
||||
if (count > 0)
|
||||
{
|
||||
while (*src && count-- && --bufsize) // NOTE: order is important; count must be dec'd *before* bufsize
|
||||
*dest++ = *src++;
|
||||
}
|
||||
|
||||
rc = ioctl(audio_fd, SNDCTL_DSP_RESET, 0);
|
||||
if (rc < 0)
|
||||
{
|
||||
perror("/dev/dsp");
|
||||
Con_Printf("Could not reset /dev/dsp\n");
|
||||
close(audio_fd);
|
||||
return 0;
|
||||
}
|
||||
*dest = 0;
|
||||
|
||||
if (ioctl(audio_fd, SNDCTL_DSP_GETCAPS, &caps)==-1)
|
||||
#if _DEBUG
|
||||
if (!bufsize)
|
||||
{
|
||||
perror("/dev/dsp");
|
||||
Con_Printf("Sound driver too old\n");
|
||||
close(audio_fd);
|
||||
return 0;
|
||||
char tmp[16];
|
||||
strncpy (tmp, start, 12);
|
||||
tmp[12] = 0;
|
||||
Con_DPrintf ("\x02""WARNING: overflow in Q_strncpy (\"%s...\")\n", tmp);
|
||||
}
|
||||
#endif
|
||||
|
||||
return dest-start;
|
||||
}
|
||||
|
||||
static qboolean snd_useoss = true;
|
||||
|
||||
int audio_fd = -1;
|
||||
qboolean snd_inited;
|
||||
|
||||
static const int tryrates[] = { 11025, 22050, 22051, 44100, 48000, 8000 };
|
||||
static char snd_dev[64] = "/dev/dsp";
|
||||
|
||||
qboolean SNDDMA_InitOSS_Direct (char **errstr)
|
||||
{
|
||||
int caps, tmp, rc;
|
||||
struct audio_buf_info info;
|
||||
|
||||
if (ioctl(audio_fd, SNDCTL_DSP_GETCAPS, &caps) == -1)
|
||||
{
|
||||
perror (snd_dev);
|
||||
*errstr = "Cannot determine capabilities of soundcard\n";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!(caps & DSP_CAP_TRIGGER) || !(caps & DSP_CAP_MMAP))
|
||||
{
|
||||
Con_Printf("Sorry but your soundcard can't do this\n");
|
||||
close(audio_fd);
|
||||
return 0;
|
||||
*errstr = "Soundcard doesn't support necessary features\n";
|
||||
return false;
|
||||
}
|
||||
if (ioctl(audio_fd, SNDCTL_DSP_GETOSPACE, &info) == -1)
|
||||
{
|
||||
perror ("GETOSPACE");
|
||||
*errstr = "Um, can't do GETOSPACE?\n";
|
||||
return false;
|
||||
}
|
||||
|
||||
if (ioctl(audio_fd, SNDCTL_DSP_GETOSPACE, &info)==-1)
|
||||
{
|
||||
perror("GETOSPACE");
|
||||
Con_Printf("Um, can't do GETOSPACE?\n");
|
||||
close(audio_fd);
|
||||
return 0;
|
||||
}
|
||||
|
||||
shm = &sn;
|
||||
shm->splitbuffer = 0;
|
||||
|
||||
// set sample bits & speed
|
||||
|
||||
s = getenv("QUAKE_SOUND_SAMPLEBITS");
|
||||
if (s) shm->samplebits = atoi(s);
|
||||
else if ((i = COM_CheckParm("-sndbits")) != 0)
|
||||
shm->samplebits = atoi(com_argv[i+1]);
|
||||
if (shm->samplebits != 16 && shm->samplebits != 8)
|
||||
{
|
||||
ioctl(audio_fd, SNDCTL_DSP_GETFMTS, &fmt);
|
||||
if (fmt & AFMT_S16_LE) shm->samplebits = 16;
|
||||
else if (fmt & AFMT_U8) shm->samplebits = 8;
|
||||
}
|
||||
|
||||
s = getenv("QUAKE_SOUND_SPEED");
|
||||
if (s) shm->speed = atoi(s);
|
||||
else if ((i = COM_CheckParm("-sndspeed")) != 0)
|
||||
shm->speed = atoi(com_argv[i+1]);
|
||||
else
|
||||
{
|
||||
for (i=0 ; i<sizeof(tryrates)/4 ; i++)
|
||||
if (!ioctl(audio_fd, SNDCTL_DSP_SPEED, &tryrates[i])) break;
|
||||
shm->speed = tryrates[i];
|
||||
}
|
||||
|
||||
s = getenv("QUAKE_SOUND_CHANNELS");
|
||||
if (s) shm->channels = atoi(s);
|
||||
else if ((i = COM_CheckParm("-sndmono")) != 0)
|
||||
shm->channels = 1;
|
||||
else if ((i = COM_CheckParm("-sndstereo")) != 0)
|
||||
shm->channels = 2;
|
||||
else shm->channels = 2;
|
||||
|
||||
shm->samples = info.fragstotal * info.fragsize / (shm->samplebits/8);
|
||||
shm->submission_chunk = 1;
|
||||
shm->samples = info.fragstotal * info.fragsize / (shm->samplebits / 8);
|
||||
// shm->submission_chunk = 1;
|
||||
|
||||
// memory map the dma buffer
|
||||
|
||||
shm->buffer = (unsigned char *) mmap(NULL, info.fragstotal
|
||||
* info.fragsize, PROT_WRITE, MAP_FILE|MAP_SHARED, audio_fd, 0);
|
||||
if (!shm->buffer || shm->buffer == (unsigned char *)-1)
|
||||
shm->buffer = (unsigned char *)mmap (NULL, info.fragstotal * info.fragsize, PROT_WRITE, MAP_FILE|MAP_SHARED, audio_fd, 0);
|
||||
if (!shm->buffer || shm->buffer == (unsigned char *)MAP_FAILED)
|
||||
{
|
||||
perror("/dev/dsp");
|
||||
Con_Printf("Could not mmap /dev/dsp\n");
|
||||
close(audio_fd);
|
||||
return 0;
|
||||
}
|
||||
|
||||
tmp = 0;
|
||||
if (shm->channels == 2)
|
||||
tmp = 1;
|
||||
rc = ioctl(audio_fd, SNDCTL_DSP_STEREO, &tmp);
|
||||
if (rc < 0)
|
||||
{
|
||||
perror("/dev/dsp");
|
||||
Con_Printf("Could not set /dev/dsp to stereo=%d", shm->channels);
|
||||
close(audio_fd);
|
||||
return 0;
|
||||
}
|
||||
if (tmp)
|
||||
shm->channels = 2;
|
||||
else
|
||||
shm->channels = 1;
|
||||
|
||||
rc = ioctl(audio_fd, SNDCTL_DSP_SPEED, &shm->speed);
|
||||
if (rc < 0)
|
||||
{
|
||||
perror("/dev/dsp");
|
||||
Con_Printf("Could not set /dev/dsp speed to %d", shm->speed);
|
||||
close(audio_fd);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (shm->samplebits == 16)
|
||||
{
|
||||
rc = AFMT_S16_LE;
|
||||
rc = ioctl(audio_fd, SNDCTL_DSP_SETFMT, &rc);
|
||||
if (rc < 0)
|
||||
{
|
||||
perror("/dev/dsp");
|
||||
Con_Printf("Could not support 16-bit data. Try 8-bit.\n");
|
||||
close(audio_fd);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
else if (shm->samplebits == 8)
|
||||
{
|
||||
rc = AFMT_U8;
|
||||
rc = ioctl(audio_fd, SNDCTL_DSP_SETFMT, &rc);
|
||||
if (rc < 0)
|
||||
{
|
||||
perror("/dev/dsp");
|
||||
Con_Printf("Could not support 8-bit data.\n");
|
||||
close(audio_fd);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
perror("/dev/dsp");
|
||||
Con_Printf("%d-bit sound not supported.", shm->samplebits);
|
||||
close(audio_fd);
|
||||
return 0;
|
||||
perror (snd_dev);
|
||||
*errstr = va ("Could not mmap %s (error %d)\n", snd_dev, errno);
|
||||
return false;
|
||||
}
|
||||
|
||||
// toggle the trigger & start her up
|
||||
|
||||
tmp = 0;
|
||||
rc = ioctl(audio_fd, SNDCTL_DSP_SETTRIGGER, &tmp);
|
||||
tmp = 0;
|
||||
rc = ioctl (audio_fd, SNDCTL_DSP_SETTRIGGER, &tmp);
|
||||
if (rc < 0)
|
||||
{
|
||||
perror("/dev/dsp");
|
||||
Con_Printf("Could not toggle.\n");
|
||||
close(audio_fd);
|
||||
return 0;
|
||||
perror (snd_dev);
|
||||
*errstr = "Could not toggle.\n";
|
||||
return false;
|
||||
}
|
||||
tmp = PCM_ENABLE_OUTPUT;
|
||||
rc = ioctl(audio_fd, SNDCTL_DSP_SETTRIGGER, &tmp);
|
||||
|
||||
tmp = PCM_ENABLE_OUTPUT;
|
||||
rc = ioctl (audio_fd, SNDCTL_DSP_SETTRIGGER, &tmp);
|
||||
if (rc < 0)
|
||||
{
|
||||
perror("/dev/dsp");
|
||||
Con_Printf("Could not toggle.\n");
|
||||
close(audio_fd);
|
||||
return 0;
|
||||
perror (snd_dev);
|
||||
*errstr = "Could not toggle.\n";
|
||||
return false;
|
||||
}
|
||||
|
||||
shm->samplepos = 0;
|
||||
|
||||
snd_inited = 1;
|
||||
return 1;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
int SNDDMA_GetDMAPos(void)
|
||||
{
|
||||
#define NB_FRAGMENTS 4
|
||||
static int old_osstime = 0;
|
||||
static unsigned int osssoundtime;
|
||||
|
||||
qboolean SNDDMA_InitOSS_Indirect (char **errstr)
|
||||
{
|
||||
int flags, ioctl_param;
|
||||
unsigned int fragmentsize, i, val;
|
||||
|
||||
// Use non-blocking IOs if possible
|
||||
flags = fcntl(audio_fd, F_GETFL);
|
||||
if (flags != -1)
|
||||
{
|
||||
if (fcntl(audio_fd, F_SETFL, flags | O_NONBLOCK) == -1)
|
||||
Con_Print ("SndSys_Init : fcntl(F_SETFL, O_NONBLOCK) failed!\n");
|
||||
}
|
||||
else
|
||||
Con_Print ("SndSys_Init: fcntl(F_GETFL) failed!\n");
|
||||
|
||||
// Set the fragment size (up to "NB_FRAGMENTS" fragments of "fragmentsize" bytes)
|
||||
fragmentsize = shm->speed * shm->channels * (shm->samplebits/8) / 10;
|
||||
fragmentsize = (unsigned int)ceilf((float)fragmentsize / (float)NB_FRAGMENTS);
|
||||
//fragmentsize = CeilPowerOf2(fragmentsize);
|
||||
//ioctl_param = (NB_FRAGMENTS << 16) | log2i(fragmentsize);
|
||||
for (i = 0, val = 1; val < fragmentsize; val <<= 1, i++);
|
||||
fragmentsize = val;
|
||||
ioctl_param = (NB_FRAGMENTS << 16) | i;
|
||||
|
||||
if (ioctl(audio_fd, SNDCTL_DSP_SETFRAGMENT, &ioctl_param) == -1)
|
||||
{
|
||||
*errstr = "SndSys_Init: could not set the fragment size\n";
|
||||
return false;
|
||||
}
|
||||
|
||||
Con_Printf ("SndSys_Init: using %u fragments of %u bytes\n",
|
||||
ioctl_param >> 16, 1 << (ioctl_param & 0xFFFF));
|
||||
|
||||
old_osstime = 0;
|
||||
osssoundtime = 0;
|
||||
// shm->buffer = Snd_CreateRingBuffer(requested, 0, NULL);
|
||||
shm->samples = NB_FRAGMENTS * fragmentsize / (shm->samplebits / 8);
|
||||
return false;
|
||||
}
|
||||
|
||||
qboolean SNDDMA_InitOSS (void)
|
||||
{
|
||||
int rc, fmt, tmp, i;
|
||||
// char *s;
|
||||
// int caps;
|
||||
// struct audio_buf_info info;
|
||||
char *errstr = NULL;
|
||||
|
||||
snd_inited = false;
|
||||
|
||||
if ((i = COM_CheckParm("-snddev")) && (i + 1 < com_argc))
|
||||
{
|
||||
Q_strcpy (snd_dev, com_argv[i + 1], sizeof(snd_dev));
|
||||
}
|
||||
// open snd_dev, confirm capability to mmap, and get size of dma buffer
|
||||
|
||||
audio_fd = open (snd_dev, O_RDWR); // darkplaces uses O_WRONLY
|
||||
if (audio_fd < 0)
|
||||
{
|
||||
perror (snd_dev);
|
||||
errstr = va ("Could not open %s\n", snd_dev);
|
||||
goto SNDFAIL;
|
||||
}
|
||||
|
||||
// disable cooked mode (OSS 4.0+, but not harmful on previous)
|
||||
tmp = 0;
|
||||
rc = ioctl(audio_fd, SNDCTL_DSP_COOKEDMODE, &tmp);
|
||||
|
||||
rc = ioctl (audio_fd, SNDCTL_DSP_RESET, 0);
|
||||
if (rc < 0)
|
||||
{
|
||||
perror (snd_dev);
|
||||
errstr = va ("Could not reset %s\n", snd_dev);
|
||||
goto SNDFAIL;
|
||||
}
|
||||
|
||||
/* if (ioctl(audio_fd, SNDCTL_DSP_GETCAPS, &caps) == -1)
|
||||
{
|
||||
perror (snd_dev);
|
||||
errstr = "Cannot determine capabilities of soundcard\n";
|
||||
goto SNDFAIL;
|
||||
}
|
||||
|
||||
if (!(caps & DSP_CAP_TRIGGER) || !(caps & DSP_CAP_MMAP))
|
||||
{
|
||||
errstr = "Soundcard doesn't support necessary features\n";
|
||||
goto SNDFAIL;
|
||||
}
|
||||
*/
|
||||
/* if (ioctl(audio_fd, SNDCTL_DSP_GETOSPACE, &info) == -1)
|
||||
{
|
||||
perror ("GETOSPACE");
|
||||
errstr = "Um, can't do GETOSPACE?\n";
|
||||
goto SNDFAIL;
|
||||
}
|
||||
*/
|
||||
/*
|
||||
shm = &sn;
|
||||
shm->splitbuffer = 0;
|
||||
*/
|
||||
// set sample bits & speed
|
||||
/* if ((s = getenv("QUAKE_SOUND_SAMPLEBITS")))
|
||||
shm->samplebits = Q_atoi(s);
|
||||
else if ((i = COM_CheckParm("-sndbits")) && (i + 1 < com_argc))
|
||||
shm->samplebits = Q_atoi(com_argv[i+1]);
|
||||
else
|
||||
shm->samplebits = 0;
|
||||
*/
|
||||
if (shm->samplebits != 16 && shm->samplebits != 8)
|
||||
{
|
||||
ioctl (audio_fd, SNDCTL_DSP_GETFMTS, &fmt);
|
||||
if (fmt & AFMT_S16_LE)
|
||||
shm->samplebits = 16;
|
||||
else if (fmt & AFMT_U8)
|
||||
shm->samplebits = 8;
|
||||
else
|
||||
{
|
||||
errstr = "Soundcard must support 8- or 16-bit sound!\n";
|
||||
goto SNDFAIL;
|
||||
}
|
||||
}
|
||||
|
||||
fmt = (shm->samplebits == 16 ? AFMT_S16_LE : AFMT_U8);
|
||||
rc = ioctl(audio_fd, SNDCTL_DSP_SETFMT, &fmt);
|
||||
if (rc < 0)
|
||||
{
|
||||
perror (snd_dev);
|
||||
errstr = va ("Soundcard does not support %d-bit data.\n", shm->samplebits);
|
||||
goto SNDFAIL;
|
||||
}
|
||||
/*
|
||||
if ((s = getenv("QUAKE_SOUND_SPEED")))
|
||||
shm->speed = Q_atoi(s);
|
||||
else if ((i = COM_CheckParm("-sndspeed")) && (i + 1 < com_argc))
|
||||
shm->speed = Q_atoi(com_argv[i+1]);
|
||||
else if (COM_CheckParm("-44khz"))
|
||||
shm->speed = 44100;
|
||||
else if (COM_CheckParm("-22khz"))
|
||||
shm->speed = 22050;
|
||||
else
|
||||
shm->speed = 0;
|
||||
*/
|
||||
if (shm->speed == 0)
|
||||
{
|
||||
for (i=0 ; i<sizeof(tryrates)/4 ; i++)
|
||||
{
|
||||
shm->speed = tryrates[i];
|
||||
if (ioctl(audio_fd, SNDCTL_DSP_SPEED, &shm->speed) == -1)
|
||||
{
|
||||
perror(snd_dev);
|
||||
}
|
||||
else if (tryrates[i] == shm->speed)
|
||||
{
|
||||
goto SET_CHANNELS;
|
||||
}
|
||||
}
|
||||
|
||||
errstr = "Soundcard does not support any known sample rates\n";
|
||||
goto SNDFAIL;
|
||||
}
|
||||
|
||||
tmp = shm->speed;
|
||||
rc = ioctl (audio_fd, SNDCTL_DSP_SPEED, &tmp);
|
||||
if (rc < 0)
|
||||
{
|
||||
perror (snd_dev);
|
||||
errstr = va ("Could not set %s speed to %d\n", snd_dev, shm->speed);
|
||||
goto SNDFAIL;
|
||||
}
|
||||
shm->speed = tmp;
|
||||
|
||||
SET_CHANNELS:
|
||||
/* if ((s = getenv("QUAKE_SOUND_CHANNELS")))
|
||||
shm->channels = Q_atoi(s);
|
||||
else if ((i = COM_CheckParm("-sndmono")))
|
||||
shm->channels = 1;
|
||||
else if ((i = COM_CheckParm("-sndstereo")))
|
||||
shm->channels = 2;
|
||||
else
|
||||
shm->channels = 2;
|
||||
*/
|
||||
tmp = shm->channels;
|
||||
rc = ioctl(audio_fd, SNDCTL_DSP_CHANNELS, &tmp);
|
||||
if (rc < 0)
|
||||
{
|
||||
perror (snd_dev);
|
||||
errstr = va ("Soundcard does not support %d channels.\n", shm->channels);
|
||||
goto SNDFAIL;
|
||||
}
|
||||
shm->channels = tmp;
|
||||
|
||||
/*
|
||||
if (ioctl(audio_fd, SNDCTL_DSP_GETOSPACE, &info) == -1)
|
||||
{
|
||||
perror ("GETOSPACE");
|
||||
errstr = "Um, can't do GETOSPACE?\n";
|
||||
goto SNDFAIL;
|
||||
}
|
||||
|
||||
shm->samples = info.fragstotal * info.fragsize / (shm->samplebits / 8);
|
||||
// shm->submission_chunk = 1;
|
||||
|
||||
// memory map the dma buffer
|
||||
shm->buffer = (unsigned char *)mmap (NULL, info.fragstotal * info.fragsize, PROT_WRITE, MAP_FILE|MAP_SHARED, audio_fd, 0);
|
||||
if (!shm->buffer || shm->buffer == (unsigned char *)MAP_FAILED)
|
||||
{
|
||||
perror (snd_dev);
|
||||
errstr = va("Could not mmap %s (error %d)\n", snd_dev, errno);
|
||||
goto SNDFAIL;
|
||||
}
|
||||
|
||||
// toggle the trigger & start her up
|
||||
tmp = 0;
|
||||
rc = ioctl (audio_fd, SNDCTL_DSP_SETTRIGGER, &tmp);
|
||||
if (rc < 0)
|
||||
{
|
||||
perror (snd_dev);
|
||||
errstr = "Could not toggle.\n";
|
||||
goto SNDFAIL;
|
||||
}
|
||||
|
||||
tmp = PCM_ENABLE_OUTPUT;
|
||||
rc = ioctl (audio_fd, SNDCTL_DSP_SETTRIGGER, &tmp);
|
||||
if (rc < 0)
|
||||
{
|
||||
perror (snd_dev);
|
||||
errstr = "Could not toggle.\n";
|
||||
goto SNDFAIL;
|
||||
}
|
||||
*/
|
||||
// shm->samplepos = 0;
|
||||
|
||||
if (!SNDDMA_InitOSS_Direct (&errstr))
|
||||
{
|
||||
// if (!SNDDMA_InitOSS_Indirect (&errstr))
|
||||
goto SNDFAIL;
|
||||
}
|
||||
|
||||
snd_inited = true;
|
||||
return true;
|
||||
|
||||
|
||||
SNDFAIL:
|
||||
if (errstr)
|
||||
Con_Printf ("\x02%s", errstr);
|
||||
if (audio_fd >= 0)
|
||||
close (audio_fd);
|
||||
return false;
|
||||
}
|
||||
|
||||
qboolean SNDDMA_Init (void)
|
||||
{
|
||||
int i;
|
||||
char *s;
|
||||
qboolean result;
|
||||
|
||||
shm = &sn;
|
||||
shm->splitbuffer = 0;
|
||||
|
||||
if ((s = getenv("QUAKE_SOUND_SAMPLEBITS")))
|
||||
shm->samplebits = Q_atoi(s);
|
||||
else if ((i = COM_CheckParm("-sndbits")) && (i + 1 < com_argc))
|
||||
shm->samplebits = Q_atoi(com_argv[i+1]);
|
||||
else
|
||||
shm->samplebits = 0;
|
||||
|
||||
if ((s = getenv("QUAKE_SOUND_SPEED")))
|
||||
shm->speed = Q_atoi(s);
|
||||
else if ((i = COM_CheckParm("-sndspeed")) && (i + 1 < com_argc))
|
||||
shm->speed = Q_atoi(com_argv[i+1]);
|
||||
else if (COM_CheckParm("-44khz"))
|
||||
shm->speed = 44100;
|
||||
else if (COM_CheckParm("-22khz"))
|
||||
shm->speed = 22050;
|
||||
else
|
||||
shm->speed = 0;
|
||||
|
||||
if ((s = getenv("QUAKE_SOUND_CHANNELS")))
|
||||
shm->channels = Q_atoi(s);
|
||||
else if ((i = COM_CheckParm("-sndmono")))
|
||||
shm->channels = 1;
|
||||
else if ((i = COM_CheckParm("-sndstereo")))
|
||||
shm->channels = 2;
|
||||
else
|
||||
shm->channels = 2;
|
||||
|
||||
if (snd_useoss)
|
||||
result = SNDDMA_InitOSS ();
|
||||
#ifdef RQM_ALSA_TEST
|
||||
else
|
||||
result = SNDDMA_InitALSA ();
|
||||
#endif
|
||||
|
||||
if (result)
|
||||
{
|
||||
shm->submission_chunk = 1;
|
||||
shm->samplepos = 0;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
int SNDDMA_GetDMAPos (void)
|
||||
{
|
||||
struct count_info count;
|
||||
|
||||
if (!snd_inited) return 0;
|
||||
|
||||
if (ioctl(audio_fd, SNDCTL_DSP_GETOPTR, &count)==-1)
|
||||
{
|
||||
perror("/dev/dsp");
|
||||
Con_Printf("Uh, sound dead.\n");
|
||||
close(audio_fd);
|
||||
snd_inited = 0;
|
||||
if (!snd_inited)
|
||||
return 0;
|
||||
|
||||
if (snd_useoss)
|
||||
{
|
||||
if (ioctl(audio_fd, SNDCTL_DSP_GETOPTR, &count) == -1)
|
||||
{
|
||||
perror (snd_dev);
|
||||
Con_Print ("Uh, sound dead.\n");
|
||||
close (audio_fd);
|
||||
snd_inited = false;
|
||||
return 0;
|
||||
}
|
||||
// shm->samplepos = (count.bytes / (shm->samplebits / 8)) & (shm->samples-1);
|
||||
// fprintf(stderr, "%d \r", count.ptr);
|
||||
shm->samplepos = count.ptr / (shm->samplebits / 8);
|
||||
}
|
||||
else
|
||||
{
|
||||
/****** FIXME ******/
|
||||
}
|
||||
// shm->samplepos = (count.bytes / (shm->samplebits / 8)) & (shm->samples-1);
|
||||
// fprintf(stderr, "%d \r", count.ptr);
|
||||
shm->samplepos = count.ptr / (shm->samplebits / 8);
|
||||
|
||||
return shm->samplepos;
|
||||
|
||||
}
|
||||
|
||||
void SNDDMA_Shutdown(void)
|
||||
void SNDDMA_Shutdown (void)
|
||||
{
|
||||
if (snd_inited)
|
||||
if (snd_useoss)
|
||||
{
|
||||
close(audio_fd);
|
||||
snd_inited = 0;
|
||||
if (snd_inited)
|
||||
{
|
||||
ioctl(audio_fd, SNDCTL_DSP_RESET, NULL); // fixes hang when using aoss
|
||||
close (audio_fd);
|
||||
audio_fd = 0;
|
||||
}
|
||||
}
|
||||
snd_inited = false;
|
||||
}
|
||||
|
||||
byte * SNDDMA_LockBuffer (unsigned *size_out)
|
||||
{
|
||||
// *size_out = ????
|
||||
return shm->buffer;
|
||||
}
|
||||
|
||||
void SNDDMA_UnlockBuffer (byte *pbuf, unsigned dwSize)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -263,7 +498,7 @@ SNDDMA_Submit
|
|||
Send sound to device if buffer isn't really the dma buffer
|
||||
===============
|
||||
*/
|
||||
void SNDDMA_Submit(void)
|
||||
void SNDDMA_Submit (void)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -26,8 +26,6 @@ int nostdout = 0;
|
|||
char *basedir = ".";
|
||||
char *cachedir = "/tmp";
|
||||
|
||||
cvar_t *sys_linerefresh; // set for entity display
|
||||
|
||||
// =======================================================================
|
||||
// General routines
|
||||
// =======================================================================
|
||||
|
|
@ -136,7 +134,6 @@ void Sys_Init(void)
|
|||
Sys_SetFPCW();
|
||||
#endif
|
||||
|
||||
sys_linerefresh = Cvar_Get ("sys_linerefresh", "0", CVAR_ORIGINAL); // 2001-09-18 New cvar system by Maddes
|
||||
}
|
||||
|
||||
void Sys_Error (char *error, ...)
|
||||
|
|
@ -309,10 +306,6 @@ void alarm_handler(int x)
|
|||
oktogo=1;
|
||||
}
|
||||
|
||||
void Sys_LineRefresh(void)
|
||||
{
|
||||
}
|
||||
|
||||
void floating_point_exception_handler(int whatever)
|
||||
{
|
||||
// Sys_Warn("floating point exception\n");
|
||||
|
|
@ -377,7 +370,7 @@ int main (int c, char **v)
|
|||
#ifdef GLQUAKE
|
||||
parms.memsize = 16*1024*1024;
|
||||
#else
|
||||
parms.memsize = 8*1024*1024;
|
||||
parms.memsize = 20*1024*1024;
|
||||
#endif
|
||||
|
||||
j = COM_CheckParm("-mem");
|
||||
|
|
@ -425,10 +418,6 @@ int main (int c, char **v)
|
|||
oldtime += time;
|
||||
|
||||
Host_Frame (time);
|
||||
|
||||
// graphic debugging aids
|
||||
if (sys_linerefresh.value)
|
||||
Sys_LineRefresh ();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -600,7 +600,7 @@ void VID_Init (unsigned char *palette)
|
|||
x_vis,
|
||||
attribmask,
|
||||
&attribs );
|
||||
XStoreName( x_disp,x_win,"xquake");
|
||||
XStoreName( x_disp,x_win,"engoo X11");
|
||||
|
||||
|
||||
if (x_visinfo->class != TrueColor)
|
||||
|
|
@ -1226,3 +1226,53 @@ void IN_Move (usercmd_t *cmd)
|
|||
}
|
||||
mouse_x = mouse_y = 0.0;
|
||||
}
|
||||
|
||||
/*
|
||||
===========
|
||||
VID_HandlePause --eukara
|
||||
===========
|
||||
*/
|
||||
void VID_HandlePause (qboolean pause)
|
||||
{
|
||||
if (pause)
|
||||
{
|
||||
IN_DeactivateMouse ();
|
||||
IN_ShowMouse ();
|
||||
}
|
||||
else
|
||||
{
|
||||
IN_ActivateMouse ();
|
||||
IN_HideMouse ();
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
===========
|
||||
IN_DeactivateMouse --eukara
|
||||
===========
|
||||
*/
|
||||
void IN_DeactivateMouse (void)
|
||||
{
|
||||
XUngrabPointer(x_disp,CurrentTime);
|
||||
}
|
||||
|
||||
/*
|
||||
===========
|
||||
IN_DeactivateMouse --eukara
|
||||
===========
|
||||
*/
|
||||
void IN_ActivateMouse (void)
|
||||
{
|
||||
XGrabPointer(x_disp,x_win,True,0,GrabModeAsync,
|
||||
GrabModeAsync,x_win,None,CurrentTime);
|
||||
}
|
||||
|
||||
void IN_HideMouse (void)
|
||||
{
|
||||
|
||||
};
|
||||
|
||||
void IN_ShowMouse (void)
|
||||
{
|
||||
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue