From 8b52e73226b73cc2a922f72fbdd868fd54202f40 Mon Sep 17 00:00:00 2001 From: eukos Date: Thu, 23 Jul 2015 15:08:13 +0200 Subject: [PATCH] removed ASM for now --- WinQuake/Makefile | 82 ++++++++++++++++++++++----------------------- WinQuake/quakedef.h | 2 +- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/WinQuake/Makefile b/WinQuake/Makefile index 33ea49c..bae119e 100644 --- a/WinQuake/Makefile +++ b/WinQuake/Makefile @@ -155,7 +155,7 @@ X11_OBJS = \ $(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 \ @@ -415,65 +415,65 @@ $(BUILDDIR)/obj/nvs_server_data.o :$(MOUNT_DIR)/nvs_server_data.c ##### -$(BUILDDIR)/obj/d_copy.o : $(MOUNT_DIR)/../asm/d_copy.s - $(DO_AS) +#$(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_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_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_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_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_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_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/d_varsa.o : $(MOUNT_DIR)/../asm/d_varsa.s +# $(DO_AS) -$(BUILDDIR)/obj/math.o : $(MOUNT_DIR)/../asm/math.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_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_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_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/r_varsa.o : $(MOUNT_DIR)/../asm/r_varsa.s +# $(DO_AS) -$(BUILDDIR)/obj/surf16.o : $(MOUNT_DIR)/../asm/surf16.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/surf8.o : $(MOUNT_DIR)/../asm/surf8.s +# $(DO_AS) -$(BUILDDIR)/obj/surf8fst.o : $(MOUNT_DIR)/../asm/surf8fst.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/worlda.o : $(MOUNT_DIR)/../asm/worlda.s +# $(DO_AS) -$(BUILDDIR)/obj/r_aclipa.o : $(MOUNT_DIR)/../asm/r_aclipa.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/snd_mixa.o : $(MOUNT_DIR)/../asm/snd_mixa.s +# $(DO_AS) -$(BUILDDIR)/obj/sys_dosa.o : $(MOUNT_DIR)/../asm/sys_dosa.s - $(DO_AS) +#$(BUILDDIR)/obj/sys_dosa.o : $(MOUNT_DIR)/../asm/sys_dosa.s +# $(DO_AS) ############################################################################# # MISC diff --git a/WinQuake/quakedef.h b/WinQuake/quakedef.h index cd2563c..c62f0e1 100644 --- a/WinQuake/quakedef.h +++ b/WinQuake/quakedef.h @@ -92,7 +92,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define ASS_MIDI // Use Apogee Sound System for MIDI playback only*WIP* #endif int inthedos; - +#define NOASM #define EFFINGMOUSE // disables "Enhance Pointer Precision" // a definite MUST for debugging