qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2025-03-14 04:01:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

move the non configure defines to after ifdef USE_INTEL_ASM for non as/ non intel systems

Browse source
This commit is contained in:
Bill Currie 2000-05-25 06:14:47 +00:00
parent 9e65b2c06d
commit 0ad3e80422
20 changed files with 38 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/cl_math.S
View file

@ -29,11 +29,10 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif
#include "asm_i386.h"
#include "quakeasm.h"
#ifdef USE_INTEL_ASM #ifdef USE_INTEL_ASM
#include "asm_i386.h"
#include "quakeasm.h"
.data .data

4
source/d_copy.S
View file

@ -29,11 +29,11 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif
#ifdef USE_INTEL_ASM
#include "asm_i386.h" #include "asm_i386.h"
#include "quakeasm.h" #include "quakeasm.h"
#include "asm_draw.h" #include "asm_draw.h"
#ifdef USE_INTEL_ASM
.data .data
LCopyWidth: .long 0 LCopyWidth: .long 0

4
source/d_draw.S
View file

@ -29,13 +29,13 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif
#ifdef USE_INTEL_ASM
#include "asm_i386.h" #include "asm_i386.h"
#include "quakeasm.h" #include "quakeasm.h"
#include "asm_draw.h" #include "asm_draw.h"
#include "d_ifacea.h" #include "d_ifacea.h"
#ifdef USE_INTEL_ASM
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// 8-bpp horizontal span drawing code for polygons, with no transparency. // 8-bpp horizontal span drawing code for polygons, with no transparency.
// //

4
source/d_draw16.S
View file

@ -30,13 +30,13 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif
#ifdef USE_INTEL_ASM
#include "asm_i386.h" #include "asm_i386.h"
#include "quakeasm.h" #include "quakeasm.h"
#include "asm_draw.h" #include "asm_draw.h"
#include "d_ifacea.h" #include "d_ifacea.h"
#ifdef USE_INTEL_ASM
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// 8-bpp horizontal span drawing code for polygons, with no transparency and // 8-bpp horizontal span drawing code for polygons, with no transparency and
// 16-pixel subdivision. // 16-pixel subdivision.

4
source/d_parta.S
View file

@ -29,13 +29,13 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif
#ifdef USE_INTEL_ASM
#include "asm_i386.h" #include "asm_i386.h"
#include "quakeasm.h" #include "quakeasm.h"
#include "d_ifacea.h" #include "d_ifacea.h"
#include "asm_draw.h" #include "asm_draw.h"
#ifdef USE_INTEL_ASM
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// 8-bpp particle drawing code. // 8-bpp particle drawing code.
//---------------------------------------------------------------------- //----------------------------------------------------------------------

4
source/d_polysa.S
View file

@ -29,13 +29,13 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif
#ifdef USE_INTEL_ASM
#include "asm_i386.h" #include "asm_i386.h"
#include "quakeasm.h" #include "quakeasm.h"
#include "asm_draw.h" #include "asm_draw.h"
#include "d_ifacea.h" #include "d_ifacea.h"
#ifdef USE_INTEL_ASM
// !!! if this is changed, it must be changed in d_polyse.c too !!! // !!! if this is changed, it must be changed in d_polyse.c too !!!
#define DPS_MAXSPANS MAXHEIGHT+1 #define DPS_MAXSPANS MAXHEIGHT+1
// 1 extra for spanpackage that marks end // 1 extra for spanpackage that marks end

4
source/d_scana.S
View file

@ -29,13 +29,13 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif
#ifdef USE_INTEL_ASM
#include "asm_i386.h" #include "asm_i386.h"
#include "quakeasm.h" #include "quakeasm.h"
#include "asm_draw.h" #include "asm_draw.h"
#include "d_ifacea.h" #include "d_ifacea.h"
#ifdef USE_INTEL_ASM
.data .data
.text .text

4
source/d_spr8.S
View file

@ -29,12 +29,12 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif
#ifdef USE_INTEL_ASM
#include "asm_i386.h" #include "asm_i386.h"
#include "quakeasm.h" #include "quakeasm.h"
#include "asm_draw.h" #include "asm_draw.h"
#ifdef USE_INTEL_ASM
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// 8-bpp horizontal span drawing code for polygons, with transparency. // 8-bpp horizontal span drawing code for polygons, with transparency.
//---------------------------------------------------------------------- //----------------------------------------------------------------------

4
source/d_varsa.S
View file

@ -29,13 +29,13 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif
#ifdef USE_INTEL_ASM
#include "asm_i386.h" #include "asm_i386.h"
#include "quakeasm.h" #include "quakeasm.h"
#include "asm_draw.h" #include "asm_draw.h"
#include "d_ifacea.h" #include "d_ifacea.h"
#ifdef USE_INTEL_ASM
.data .data
//------------------------------------------------------- //-------------------------------------------------------

5
source/math.S
View file

@ -29,11 +29,10 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif
#include "asm_i386.h"
// #include "quakeasm.h"
#ifdef USE_INTEL_ASM #ifdef USE_INTEL_ASM
#include "asm_i386.h"
// #include "quakeasm.h"
.data .data

4
source/r_aclipa.S
View file

@ -30,13 +30,13 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif
#ifdef USE_INTEL_ASM
#include "asm_i386.h" #include "asm_i386.h"
#include "quakeasm.h" #include "quakeasm.h"
#include "asm_draw.h" #include "asm_draw.h"
#include "d_ifacea.h" #include "d_ifacea.h"
#ifdef USE_INTEL_ASM
.data .data
Ltemp0: .long 0 Ltemp0: .long 0
Ltemp1: .long 0 Ltemp1: .long 0

4
source/r_aliasa.S
View file

@ -29,13 +29,13 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif
#ifdef USE_INTEL_ASM
#include "asm_i386.h" #include "asm_i386.h"
#include "quakeasm.h" #include "quakeasm.h"
#include "asm_draw.h" #include "asm_draw.h"
#include "d_ifacea.h" #include "d_ifacea.h"
#ifdef USE_INTEL_ASM
.data .data
Lfloat_1: .single 1.0 Lfloat_1: .single 1.0

4
source/r_drawa.S
View file

@ -29,13 +29,13 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif
#ifdef USE_INTEL_ASM
#include "asm_i386.h" #include "asm_i386.h"
#include "quakeasm.h" #include "quakeasm.h"
#include "asm_draw.h" #include "asm_draw.h"
#include "d_ifacea.h" #include "d_ifacea.h"
#ifdef USE_INTEL_ASM
// !!! if these are changed, they must be changed in r_draw.c too !!! // !!! if these are changed, they must be changed in r_draw.c too !!!
#define FULLY_CLIPPED_CACHED 0x80000000 #define FULLY_CLIPPED_CACHED 0x80000000
#define FRAMECOUNT_MASK 0x7FFFFFFF #define FRAMECOUNT_MASK 0x7FFFFFFF

4
source/r_edgea.S
View file

@ -29,12 +29,12 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif
#ifdef USE_INTEL_ASM
#include "asm_i386.h" #include "asm_i386.h"
#include "quakeasm.h" #include "quakeasm.h"
#include "asm_draw.h" #include "asm_draw.h"
#ifdef USE_INTEL_ASM
.data .data
Ltemp: .long 0 Ltemp: .long 0
float_1_div_0100000h: .long 0x35800000 // 1.0/(float)0x100000 float_1_div_0100000h: .long 0x35800000 // 1.0/(float)0x100000

4
source/r_varsa.S
View file

@ -29,13 +29,13 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif
#ifdef USE_INTEL_ASM
#include "asm_i386.h" #include "asm_i386.h"
#include "quakeasm.h" #include "quakeasm.h"
#include "asm_draw.h" #include "asm_draw.h"
#include "d_ifacea.h" #include "d_ifacea.h"
#ifdef USE_INTEL_ASM
.data .data
//------------------------------------------------------- //-------------------------------------------------------

4
source/snd_mixa.S
View file

@ -29,10 +29,10 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif
#include "asm_i386.h"
// #include "quakeasm.h"
#ifdef USE_INTEL_ASM #ifdef USE_INTEL_ASM
#include "asm_i386.h"
// #include "quakeasm.h"
.text .text

4
source/surf16.S
View file

@ -29,12 +29,12 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif
#ifdef USE_INTEL_ASM
#include "asm_i386.h" #include "asm_i386.h"
#include "quakeasm.h" #include "quakeasm.h"
#include "asm_draw.h" #include "asm_draw.h"
#ifdef USE_INTEL_ASM
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// Surface block drawer // Surface block drawer
//---------------------------------------------------------------------- //----------------------------------------------------------------------

3
source/surf8.S
View file

@ -30,12 +30,11 @@
# include "config.h" # include "config.h"
#endif #endif
#ifdef USE_INTEL_ASM
#include "asm_i386.h" #include "asm_i386.h"
#include "quakeasm.h" #include "quakeasm.h"
#include "asm_draw.h" #include "asm_draw.h"
#ifdef USE_INTEL_ASM
.data .data
sb_v: .long 0 sb_v: .long 0

3
source/sys_x86.S
View file

@ -29,10 +29,9 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif
#include "asm_i386.h"
#ifdef USE_INTEL_ASM #ifdef USE_INTEL_ASM
#include "asm_i386.h"
.data .data
.align 4 .align 4

4
source/worlda.S
View file

@ -29,12 +29,12 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif
#ifdef USE_INTEL_ASM
#include "asm_i386.h" #include "asm_i386.h"
//#include "quakeasm.h" //#include "quakeasm.h"
//include "d_ifacea.h" //include "d_ifacea.h"
#ifdef USE_INTEL_ASM
.data .data
Ltemp: .long 0 Ltemp: .long 0