Made NOASM easier to compile with

This commit is contained in:
eukos 2015-09-01 10:59:39 +02:00
parent 7f07775450
commit c194c200c0
29 changed files with 77 additions and 493 deletions

View file

@ -1,490 +0,0 @@
#
# 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=./engine/
MASTER_DIR=./
BUILD_DEBUG_DIR=.debug
BUILD_RELEASE_DIR=.release
CC=gcc -m32
BASE_CFLAGS=-Dstricmp=strcasecmp -Wunused -I./include/ `pkg-config --cflags glib-2.0`
RELEASE_CFLAGS=$(BASE_CFLAGS) -O2 -funroll-loops -ffast-math -fomit-frame-pointer -funsigned-char -fno-strength-reduce
DEBUG_CFLAGS=$(BASE_CFLAGS) -g
LDFLAGS=-lm -ldl `pkg-config --libs glib-2.0` -lxmms
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_X11_CC=$(CC) $(CFLAGS) $(XCFLAGS) -o $@ -c $<
DO_X11_DEBUG_CC=$(CC) $(DEBUG_CFLAGS) $(XCFLAGS) -o $@ -c $<
DO_O_CC=$(CC) $(CFLAGS) -o $@ -c $<
DO_AS=$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
#############################################################################
# SETUP AND BUILD
#############################################################################
TARGETS=$(MASTER_DIR)/ngunix.x11
build_debug:
@-mkdir $(BUILD_DEBUG_DIR) \
$(BUILD_DEBUG_DIR)
$(MAKE) targets BUILDDIR=$(BUILD_DEBUG_DIR) CFLAGS="$(DEBUG_CFLAGS)"
build_release:
@-mkdir $(BUILD_RELEASE_DIR) \
$(BUILD_RELEASE_DIR)
$(MAKE) targets BUILDDIR=$(BUILD_RELEASE_DIR) CFLAGS="$(RELEASE_CFLAGS)"
all: build_debug build_release
targets: $(TARGETS)
#############################################################################
# X11 Quake
#############################################################################
NGUNIXMMS_OBJS = \
$(BUILDDIR)/cl_demo.o \
$(BUILDDIR)/cl_input.o \
$(BUILDDIR)/cl_main.o \
$(BUILDDIR)/cl_parse.o \
$(BUILDDIR)/cl_tent.o \
$(BUILDDIR)/chase.o \
$(BUILDDIR)/cmd.o \
$(BUILDDIR)/common.o \
$(BUILDDIR)/console.o \
$(BUILDDIR)/crc.o \
$(BUILDDIR)/cvar.o \
$(BUILDDIR)/draw.o \
$(BUILDDIR)/d_edge.o \
$(BUILDDIR)/d_fill.o \
$(BUILDDIR)/d_init.o \
$(BUILDDIR)/d_modech.o \
$(BUILDDIR)/d_part.o \
$(BUILDDIR)/d_polyse.o \
$(BUILDDIR)/d_scan.o \
$(BUILDDIR)/d_sky.o \
$(BUILDDIR)/d_sprite.o \
$(BUILDDIR)/d_surf.o \
$(BUILDDIR)/d_vars.o \
$(BUILDDIR)/d_zpoint.o \
$(BUILDDIR)/host.o \
$(BUILDDIR)/host_cmd.o \
$(BUILDDIR)/keys.o \
$(BUILDDIR)/menu.o \
$(BUILDDIR)/mathlib.o \
$(BUILDDIR)/model.o \
$(BUILDDIR)/model_common.o \
$(BUILDDIR)/net_dgrm.o \
$(BUILDDIR)/net_loop.o \
$(BUILDDIR)/net_main.o \
$(BUILDDIR)/net_vcr.o \
$(BUILDDIR)/net_udp.o \
$(BUILDDIR)/net_bsd.o \
$(BUILDDIR)/nonintel.o \
$(BUILDDIR)/pr_cmds.o \
$(BUILDDIR)/pr_edict.o \
$(BUILDDIR)/pr_exec.o \
$(BUILDDIR)/r_aclip.o \
$(BUILDDIR)/r_alias.o \
$(BUILDDIR)/r_bsp.o \
$(BUILDDIR)/r_light.o \
$(BUILDDIR)/r_draw.o \
$(BUILDDIR)/r_efrag.o \
$(BUILDDIR)/r_edge.o \
$(BUILDDIR)/r_misc.o \
$(BUILDDIR)/r_main.o \
$(BUILDDIR)/r_sky.o \
$(BUILDDIR)/r_sprite.o \
$(BUILDDIR)/r_surf.o \
$(BUILDDIR)/r_part.o \
$(BUILDDIR)/r_vars.o \
$(BUILDDIR)/screen.o \
$(BUILDDIR)/sbar.o \
$(BUILDDIR)/sv_main.o \
$(BUILDDIR)/sv_phys.o \
$(BUILDDIR)/sv_move.o \
$(BUILDDIR)/sv_user.o \
$(BUILDDIR)/zone.o \
$(BUILDDIR)/view.o \
$(BUILDDIR)/wad.o \
$(BUILDDIR)/world.o \
$(BUILDDIR)/tracker_xmms.o \
$(BUILDDIR)/cd_null.o \
$(BUILDDIR)/sys_linux.o \
$(BUILDDIR)/vid_x.o \
$(BUILDDIR)/snd_dma.o \
$(BUILDDIR)/snd_mem.o \
$(BUILDDIR)/snd_mix.o \
$(BUILDDIR)/snd_linux.o \
$(BUILDDIR)/bot.o \
$(BUILDDIR)/nvs_client.o \
$(BUILDDIR)/nvs_common.o \
$(BUILDDIR)/nvs_server.o \
$(BUILDDIR)/nvs_server_data.o \
\
$(BUILDDIR)/d_draw.o \
$(BUILDDIR)/d_draw16.o \
$(BUILDDIR)/d_parta.o \
$(BUILDDIR)/d_polysa.o \
$(BUILDDIR)/d_scana.o \
$(BUILDDIR)/d_spr8.o \
$(BUILDDIR)/d_varsa.o \
$(BUILDDIR)/math.o \
$(BUILDDIR)/r_aliasa.o \
$(BUILDDIR)/r_drawa.o \
$(BUILDDIR)/r_edgea.o \
$(BUILDDIR)/r_varsa.o \
$(BUILDDIR)/surf16.o \
$(BUILDDIR)/surf8.o \
$(BUILDDIR)/surf8fst.o \
$(BUILDDIR)/worlda.o \
$(BUILDDIR)/r_aclipa.o \
$(BUILDDIR)/snd_mixa.o \
$(BUILDDIR)/sys_dosa.o
$(MASTER_DIR)/ngunix.x11 : $(NGUNIXMMS_OBJS)
$(CC) $(CFLAGS) -o $@ $(NGUNIXMMS_OBJS) $(XLDFLAGS) $(LDFLAGS)
$(BUILDDIR)/cl_demo.o : $(MOUNT_DIR)/cl_demo.c
$(DO_CC)
$(BUILDDIR)/cl_input.o : $(MOUNT_DIR)/cl_input.c
$(DO_CC)
$(BUILDDIR)/cl_main.o : $(MOUNT_DIR)/cl_main.c
$(DO_CC)
$(BUILDDIR)/cl_parse.o : $(MOUNT_DIR)/cl_parse.c
$(DO_CC)
$(BUILDDIR)/cl_tent.o : $(MOUNT_DIR)/cl_tent.c
$(DO_CC)
$(BUILDDIR)/chase.o : $(MOUNT_DIR)/chase.c
$(DO_CC)
$(BUILDDIR)/cmd.o : $(MOUNT_DIR)/cmd.c
$(DO_CC)
$(BUILDDIR)/common.o : $(MOUNT_DIR)/common.c
$(DO_CC)
$(BUILDDIR)/console.o : $(MOUNT_DIR)/console.c
$(DO_CC)
$(BUILDDIR)/crc.o : $(MOUNT_DIR)/crc.c
$(DO_CC)
$(BUILDDIR)/cvar.o : $(MOUNT_DIR)/cvar.c
$(DO_CC)
$(BUILDDIR)/draw.o : $(MOUNT_DIR)/draw.c
$(DO_CC)
$(BUILDDIR)/d_edge.o : $(MOUNT_DIR)/../renderer/d_edge.c
$(DO_CC)
$(BUILDDIR)/d_fill.o : $(MOUNT_DIR)/../renderer/d_fill.c
$(DO_CC)
$(BUILDDIR)/d_init.o : $(MOUNT_DIR)/../renderer/d_init.c
$(DO_CC)
$(BUILDDIR)/d_modech.o : $(MOUNT_DIR)/../renderer/d_modech.c
$(DO_CC)
$(BUILDDIR)/d_part.o : $(MOUNT_DIR)/../renderer/d_part.c
$(DO_CC)
$(BUILDDIR)/d_polyse.o : $(MOUNT_DIR)/../renderer/d_polyse.c
$(DO_CC)
$(BUILDDIR)/d_scan.o : $(MOUNT_DIR)/../renderer/d_scan.c
$(DO_CC)
$(BUILDDIR)/d_sky.o : $(MOUNT_DIR)/../renderer/d_sky.c
$(DO_CC)
$(BUILDDIR)/d_sprite.o : $(MOUNT_DIR)/../renderer/d_sprite.c
$(DO_CC)
$(BUILDDIR)/d_surf.o : $(MOUNT_DIR)/../renderer/d_surf.c
$(DO_CC)
$(BUILDDIR)/d_vars.o : $(MOUNT_DIR)/../renderer/d_vars.c
$(DO_CC)
$(BUILDDIR)/d_zpoint.o : $(MOUNT_DIR)/../renderer/d_zpoint.c
$(DO_CC)
$(BUILDDIR)/host.o : $(MOUNT_DIR)/host.c
$(DO_CC)
$(BUILDDIR)/host_cmd.o : $(MOUNT_DIR)/host_cmd.c
$(DO_CC)
$(BUILDDIR)/keys.o : $(MOUNT_DIR)/keys.c
$(DO_CC)
$(BUILDDIR)/menu.o : $(MOUNT_DIR)/menu.c
$(DO_CC)
$(BUILDDIR)/mathlib.o : $(MOUNT_DIR)/mathlib.c
$(DO_CC)
$(BUILDDIR)/model.o : $(MOUNT_DIR)/model.c
$(DO_CC)
$(BUILDDIR)/model_common.o :$(MOUNT_DIR)/model_common.c
$(DO_CC)
$(BUILDDIR)/net_dgrm.o : $(MOUNT_DIR)/../network/net_dgrm.c
$(DO_CC)
$(BUILDDIR)/net_loop.o : $(MOUNT_DIR)/../network/net_loop.c
$(DO_CC)
$(BUILDDIR)/net_main.o : $(MOUNT_DIR)/../network/net_main.c
$(DO_CC)
$(BUILDDIR)/net_vcr.o : $(MOUNT_DIR)/../network/net_vcr.c
$(DO_CC)
$(BUILDDIR)/net_udp.o : $(MOUNT_DIR)/../network/net_udp.c
$(DO_CC)
$(BUILDDIR)/net_bsd.o : $(MOUNT_DIR)/../network/net_bsd.c
$(DO_CC)
$(BUILDDIR)/nonintel.o : $(MOUNT_DIR)/nonintel.c
$(DO_CC)
$(BUILDDIR)/pr_cmds.o : $(MOUNT_DIR)/pr_cmds.c
$(DO_CC)
$(BUILDDIR)/pr_edict.o : $(MOUNT_DIR)/pr_edict.c
$(DO_CC)
$(BUILDDIR)/pr_exec.o : $(MOUNT_DIR)/pr_exec.c
$(DO_CC)
$(BUILDDIR)/r_aclip.o : $(MOUNT_DIR)/../renderer/r_aclip.c
$(DO_CC)
$(BUILDDIR)/r_alias.o : $(MOUNT_DIR)/../renderer/r_alias.c
$(DO_CC)
$(BUILDDIR)/r_bsp.o : $(MOUNT_DIR)/../renderer/r_bsp.c
$(DO_CC)
$(BUILDDIR)/r_light.o : $(MOUNT_DIR)/../renderer/r_light.c
$(DO_CC)
$(BUILDDIR)/r_draw.o : $(MOUNT_DIR)/../renderer/r_draw.c
$(DO_CC)
$(BUILDDIR)/r_efrag.o : $(MOUNT_DIR)/../renderer/r_efrag.c
$(DO_CC)
$(BUILDDIR)/r_edge.o : $(MOUNT_DIR)/../renderer/r_edge.c
$(DO_CC)
$(BUILDDIR)/r_misc.o : $(MOUNT_DIR)/../renderer/r_misc.c
$(DO_CC)
$(BUILDDIR)/r_main.o : $(MOUNT_DIR)/../renderer/r_main.c
$(DO_CC)
$(BUILDDIR)/r_sky.o : $(MOUNT_DIR)/../renderer/r_sky.c
$(DO_CC)
$(BUILDDIR)/r_sprite.o : $(MOUNT_DIR)/../renderer/r_sprite.c
$(DO_CC)
$(BUILDDIR)/r_surf.o : $(MOUNT_DIR)/../renderer/r_surf.c
$(DO_CC)
$(BUILDDIR)/r_part.o : $(MOUNT_DIR)/../renderer/r_part.c
$(DO_CC)
$(BUILDDIR)/r_vars.o : $(MOUNT_DIR)/../renderer/r_vars.c
$(DO_CC)
$(BUILDDIR)/screen.o : $(MOUNT_DIR)/screen.c
$(DO_CC)
$(BUILDDIR)/sbar.o : $(MOUNT_DIR)/sbar.c
$(DO_CC)
$(BUILDDIR)/sv_main.o : $(MOUNT_DIR)/sv_main.c
$(DO_CC)
$(BUILDDIR)/sv_phys.o : $(MOUNT_DIR)/sv_phys.c
$(DO_CC)
$(BUILDDIR)/sv_move.o : $(MOUNT_DIR)/sv_move.c
$(DO_CC)
$(BUILDDIR)/sv_user.o : $(MOUNT_DIR)/sv_user.c
$(DO_CC)
$(BUILDDIR)/zone.o :$(MOUNT_DIR)/zone.c
$(DO_CC)
$(BUILDDIR)/view.o : $(MOUNT_DIR)/view.c
$(DO_CC)
$(BUILDDIR)/wad.o : $(MOUNT_DIR)/wad.c
$(DO_CC)
$(BUILDDIR)/world.o : $(MOUNT_DIR)/world.c
$(DO_CC)
$(BUILDDIR)/tracker_xmms.o : $(MOUNT_DIR)/../tracker/tracker_xmms.c
$(DO_CC) `/usr/bin/xmms-config --libs`
$(BUILDDIR)/cd_null.o : $(MOUNT_DIR)/../audio/cd_null.c
$(DO_CC)
$(BUILDDIR)/sys_linux.o :$(MOUNT_DIR)/../system/sys_linux.c
$(DO_CC)
$(BUILDDIR)/vid_x.o: $(MOUNT_DIR)/../video/vid_x.c
$(DO_O_CC)
$(BUILDDIR)/snd_dma.o : $(MOUNT_DIR)/../audio/snd_dma.c
$(DO_CC)
$(BUILDDIR)/snd_mem.o : $(MOUNT_DIR)/../audio/snd_mem.c
$(DO_CC)
$(BUILDDIR)/snd_mix.o : $(MOUNT_DIR)/../audio/snd_mix.c
$(DO_CC)
$(BUILDDIR)/snd_linux.o :$(MOUNT_DIR)/../audio/snd_linux.c
$(DO_CC)
$(BUILDDIR)/bot.o :$(MOUNT_DIR)/bot.c
$(DO_CC)
$(BUILDDIR)/nvs_client.o :$(MOUNT_DIR)/../network/nvs_client.c
$(DO_CC)
$(BUILDDIR)/nvs_common.o :$(MOUNT_DIR)/../network/nvs_common.c
$(DO_CC)
$(BUILDDIR)/nvs_server.o :$(MOUNT_DIR)/../network/nvs_server.c
$(DO_CC)
$(BUILDDIR)/nvs_server_data.o :$(MOUNT_DIR)/../network/nvs_server_data.c
$(DO_CC)
#####
$(BUILDDIR)/d_copy.o : $(MOUNT_DIR)/../asm/d_copy.s
$(DO_AS)
$(BUILDDIR)/d_draw.o : $(MOUNT_DIR)/../asm/d_draw.s
$(DO_AS)
$(BUILDDIR)/d_draw16.o : $(MOUNT_DIR)/../asm/d_draw16.s
$(DO_AS)
$(BUILDDIR)/d_parta.o : $(MOUNT_DIR)/../asm/d_parta.s
$(DO_AS)
$(BUILDDIR)/d_polysa.o : $(MOUNT_DIR)/../asm/d_polysa.s
$(DO_AS)
$(BUILDDIR)/d_scana.o : $(MOUNT_DIR)/../asm/d_scana.s
$(DO_AS)
$(BUILDDIR)/d_spr8.o : $(MOUNT_DIR)/../asm/d_spr8.s
$(DO_AS)
$(BUILDDIR)/d_varsa.o : $(MOUNT_DIR)/../asm/d_varsa.s
$(DO_AS)
$(BUILDDIR)/math.o : $(MOUNT_DIR)/../asm/math.s
$(DO_AS)
$(BUILDDIR)/r_aliasa.o : $(MOUNT_DIR)/../asm/r_aliasa.s
$(DO_AS)
$(BUILDDIR)/r_drawa.o : $(MOUNT_DIR)/../asm/r_drawa.s
$(DO_AS)
$(BUILDDIR)/r_edgea.o : $(MOUNT_DIR)/../asm/r_edgea.s
$(DO_AS)
$(BUILDDIR)/r_varsa.o : $(MOUNT_DIR)/../asm/r_varsa.s
$(DO_AS)
$(BUILDDIR)/surf16.o : $(MOUNT_DIR)/../asm/surf16.s
$(DO_AS)
$(BUILDDIR)/surf8.o : $(MOUNT_DIR)/../asm/surf8.s
$(DO_AS)
$(BUILDDIR)/surf8fst.o : $(MOUNT_DIR)/../asm/surf8fst.s
$(DO_AS)
$(BUILDDIR)/worlda.o : $(MOUNT_DIR)/../asm/worlda.s
$(DO_AS)
$(BUILDDIR)/r_aclipa.o : $(MOUNT_DIR)/../asm/r_aclipa.s
$(DO_AS)
$(BUILDDIR)/snd_mixa.o : $(MOUNT_DIR)/../asm/snd_mixa.s
$(DO_AS)
$(BUILDDIR)/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 $(NGUNIXMMS_OBJS)

View file

@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// x86 assembly-language screen copying code.
//
#ifndef NOASM
#include "asm_i386.h"
#include "quakeasm.h"
#include "asm_draw.h"
@ -165,3 +166,4 @@ LLRowLoop:
popl %ebp // restore the caller's stack frame
ret
#endif

View file

@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// x86 assembly-language horizontal 8-bpp span-drawing code.
//
#ifndef NOASM
#include "asm_i386.h"
#include "quakeasm.h"
#include "asm_draw.h"
@ -1036,3 +1037,4 @@ LFDone:
ret
#endif // id386
#endif // NOASM

View file

@ -23,6 +23,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// subdivision.
//
#ifndef NOASM
#include "asm_i386.h"
#include "quakeasm.h"
#include "asm_draw.h"
@ -973,3 +975,4 @@ LEndSpan:
ret
#endif // id386
#endif

View file

@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// x86 assembly-language horizontal 8-bpp span-drawing code, with 16-pixel
// subdivision, exclusively for use with fog.
//
#ifndef NOASM
#include "asm_i386.h"
#include "quakeasm.h"
@ -1051,3 +1052,4 @@ LPatchLoop8:
ret
#endif // id386
#endif

View file

@ -17,6 +17,9 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef NOASM
//
// d_parta.s
// x86 assembly-language 8-bpp particle-drawing code.
@ -478,3 +481,4 @@ LPop1AndDone:
jmp LDone
#endif // id386
#endif

View file

@ -22,6 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// x86 assembly-language polygon model drawing code
//
#ifndef NOASM
#include "asm_i386.h"
#include "quakeasm.h"
#include "asm_draw.h"
@ -1744,3 +1746,4 @@ LNextTri:
#endif // id386
#endif

View file

@ -22,6 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// x86 assembly-language turbulent texture mapping code
//
#ifndef NOASM
#include "asm_i386.h"
#include "quakeasm.h"
#include "asm_draw.h"
@ -93,3 +95,4 @@ Llp:
#endif // id386
#endif

View file

@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// x86 assembly-language horizontal 8-bpp transparent span-drawing code.
//
#ifndef NOASM
#include "asm_i386.h"
#include "quakeasm.h"
#include "asm_draw.h"
@ -898,3 +899,4 @@ LNextSpan:
ret
#endif // id386
#endif

View file

@ -21,6 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// d_varsa.s
//
#ifndef NOASM
#include "asm_i386.h"
#include "quakeasm.h"
#include "asm_draw.h"
@ -210,3 +212,4 @@ spr8entryvec_table: .long 0, Spr8Entry2_8, Spr8Entry3_8, Spr8Entry4_8
.long Spr8Entry5_8, Spr8Entry6_8, Spr8Entry7_8, Spr8Entry8_8
#endif // id386
#endif

View file

@ -18,6 +18,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef NOASM
#include "asm_i386.h"
.data
@ -94,4 +96,4 @@ qqq:
ret
#endif
#endif

View file

@ -21,6 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// math.s
// x86 assembly-language math routines.
#ifndef NOASM
#define GLQUAKE 1 // don't include unneeded client defs
#include "asm_i386.h"
#include "quakeasm.h"
@ -425,3 +427,4 @@ Lerror:
call C(BOPS_Error)
#endif // id386
#endif

View file

@ -22,6 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// x86 assembly-language Alias model transform and project code.
//
#ifndef NOASM
#include "asm_i386.h"
#include "quakeasm.h"
#include "asm_draw.h"
@ -213,3 +215,4 @@ C(R_Alias_clip_left):
#endif // id386
#endif

View file

@ -22,6 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// x86 assembly-language Alias model transform and project code.
//
#ifndef NOASM
#include "asm_i386.h"
#include "quakeasm.h"
#include "asm_draw.h"
@ -234,3 +236,4 @@ Lsavelight:
jmp Lp1
#endif // id386
#endif

View file

@ -22,6 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// x86 assembly-language edge clipping and emission code
//
#ifndef NOASM
#include "asm_i386.h"
#include "quakeasm.h"
#include "asm_draw.h"
@ -835,3 +837,4 @@ LClampP3:
ret
#endif // id386
#endif

View file

@ -22,6 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// x86 assembly-language edge-processing code.
//
#ifndef NOASM
#include "asm_i386.h"
#include "quakeasm.h"
#include "asm_draw.h"
@ -747,3 +749,4 @@ C(R_SurfacePatch):
ret
#endif // id386
#endif

View file

@ -21,6 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// r_varsa.s
//
#ifndef NOASM
#include "asm_i386.h"
#include "quakeasm.h"
#include "asm_draw.h"
@ -61,3 +63,4 @@ FloatMinus2ToThe31nd: .long 0xcf000000
C(r_bmodelactive): .long 0
#endif // id386
#endif

View file

@ -22,6 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// x86 assembly-language sound code
//
#ifndef NOASM
#define GLQUAKE 1 // don't include unneeded client defs
#include "asm_i386.h"
#include "quakeasm.h"
@ -216,3 +218,4 @@ LClampDone2:
#endif // id386
#endif

View file

@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// surf16.s
// x86 assembly-language 16 bpp surface block drawing code.
//
#ifndef NOASM
#include "asm_i386.h"
#include "quakeasm.h"
@ -170,3 +171,4 @@ LPatchLoop16:
#endif // id386
#endif

View file

@ -22,6 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// x86 assembly-language 8 bpp surface block drawing code.
//
#ifndef NOASM
#include "asm_i386.h"
#include "quakeasm.h"
#include "asm_draw.h"
@ -783,3 +785,4 @@ LPatchLoop8:
ret
#endif // id386
#endif

View file

@ -22,6 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// x86 assembly-language 8 bpp surface block drawing code.
//
#ifndef NOASM
#include "asm_i386.h"
#include "quakeasm.h"
#include "asm_draw.h"
@ -788,3 +790,4 @@ LPatchLoop8:
#endif // colhack
#endif // id386
#endif

View file

@ -22,6 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// x86 assembly-language 8 bpp surface block drawing code.
//
#ifndef NOASM
#include "asm_i386.h"
#include "quakeasm.h"
#include "asm_draw.h"
@ -730,3 +732,4 @@ LPatchLoop8:
ret
#endif // id386
#endif

View file

@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// surf8.s
// x86 assembly-language 8 bpp surface block drawing code.
//
#ifndef NOASM
#include "asm_i386.h"
#include "quakeasm.h"
@ -788,3 +789,4 @@ LPatchLoop8:
#endif // colhack
#endif // id386
#endif

View file

@ -22,6 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// x86 assembly-language 8 bpp surface block drawing code.
//
#ifndef NOASM
#include "asm_i386.h"
#include "quakeasm.h"
#include "asm_draw.h"
@ -788,3 +790,4 @@ LPatchLoop8:
#endif // colhack
#endif // id386
#endif

View file

@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// x86 assembly-language 8 bpp surface block drawing code.
//
#ifndef NOASM
#include "asm_i386.h"
#include "quakeasm.h"
#include "asm_draw.h"
@ -788,3 +789,4 @@ LPatchLoop8:
ret
#endif // id386
#endif

View file

@ -21,6 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// sys_dosa.s
// x86 assembly-language DOS-dependent routines.
#ifndef NOASM
#include "asm_i386.h"
#include "quakeasm.h"
@ -250,4 +252,5 @@ push ax
pop ax
ret
ret
#endif

View file

@ -21,6 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// sys_wina.s
// x86 assembly-language Win-dependent routines.
#ifndef NOASM
#define GLQUAKE 1 // don't include unneeded client defs
#include "asm_i386.h"
#include "quakeasm.h"
@ -113,3 +115,4 @@ C(Sys_SetFPCW):
movl %eax,ceil_cw
ret
#endif

View file

@ -22,6 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// x86 assembly-language server testing stuff
//
#ifndef NOASM
#define GLQUAKE 1 // don't include unneeded client defs
#include "asm_i386.h"
#include "quakeasm.h"
@ -141,3 +143,4 @@ Lhquickout:
ret
#endif // id386
#endif

View file

@ -139,7 +139,7 @@ hull_t *SV_HullForEntity (edict_t *ent, vec3_t mins, vec3_t maxs, vec3_t offset)
model = sv.models[ (int)ent->v.modelindex ];
if (!model || model->type != mod_brush){
Con_DPrintf ("WARNING: SOLID_BSP with a non bsp model\nChanging it to SOLID_NOT\n");
Con_DPrintf ("WARNING: SOLID_BSP with a non bsp model\n");
VectorSubtract (ent->v.mins, maxs, hullmins);
VectorSubtract (ent->v.maxs, mins, hullmaxs);
hull = SV_HullForBox (hullmins, hullmaxs);