qf
/
quakeforge-old
mirror of https://git.code.sf.net/p/quake/quakeforge-old
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

no-asm patch from Darius

This commit is contained in:
Bill Currie 2000-02-03 02:34:26 +00:00
parent 64a5b117ab
commit 083021da12
7 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
acconfig.h
View File

@ -43,8 +43,3 @@
@BOTTOM@
#ifdef __i386__
#define id386 1
#else
#define id386 0
#endif

6
common/quakeasm.h
View File

@ -27,12 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define __i386__ 1
#endif
#ifdef __i386__
#define id386 1
#else
#define id386 0
#endif
// !!! must be kept the same as in d_iface.h !!!
#define TRANSPARENT_COLOR 255

11
configure.in
View File

@ -496,6 +496,16 @@ case "${target}" in
*) AC_MSG_RESULT(no)
esac
AC_MSG_CHECKING(to see if we should disable x86 optimizations)
AC_ARG_ENABLE(asmopt,
[ --disable-asmopt Disable assembler optimization (on ia32 machines)],
NO_ASMOPT=yes, NO_ASMOPT=no
)
if test "x$NO_ASMOPT" = xyes; then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
dnl Check for sound libraries
AC_CHECK_LIB(mme,waveOutOpen,HAVE_LIBMME=yes)
@ -740,6 +750,7 @@ AC_SUBST(SOUND_STYLE)
AC_SUBST(SOUND_LIBS)
AC_SUBST(DYN_LIBS)
AC_SUBST(INTEL_ARCH)
AC_SUBST(NO_ASMOPT)
AC_SUBST(NET_LIBS)
AC_SUBST(SYS_SRC)
AC_SUBST(QW_CL_SYS_SRC)

7
qw_client/Makefile.in
View File

@ -30,6 +30,7 @@ LDFLAGS = @LDFLAGS@ @SOUND_LIBS@ @NET_LIBS@ -lm
LIBS = @LIBS@
CC = @CC@
INTEL_ARCH = @INTEL_ARCH@
NO_ASMOPT = @NO_ASMOPT@
ifneq ($(SRC_DIR),.)
SRC_DIR_INC = -I$(SRC_DIR)
@ -110,10 +111,11 @@ all: $(targets)
# Source files
#
ifeq ($(INTEL_ARCH),yes)
ifneq ($(NO_ASMOPT),yes)
# Source file the Intel archictecture only
CFLAGS = -Did386=1
UQ_GENERAL_SRC = worlda.s
UQ_SWREND_SRC_PLAT = dosasm.s
CL_ADDITIONAL_GENERAL_SRC = sys_dosa.s math.s
@ -124,6 +126,7 @@ else
# Source files for non-Intel platforms
CFLAGS = -Did386=0
SWREND_SRC_PLAT = nonintel.c
endif
@ -184,7 +187,7 @@ CL_COMMON_SRC = $(MISC_SRC) $(CL_GUI_SRC) $(CL_SRC) \
# Directory specific stuff
#
DEFS = @DEFS@
CFLAGS = @CFLAGS@ -DQUAKEWORLD $(OPTFLAGS) $(DEFS) -I. \
CFLAGS += @CFLAGS@ -DQUAKEWORLD $(OPTFLAGS) $(DEFS) -I. \
$(SRC_DIR_INC) -I$(QW_COMMON_DIR) -I$(COMMON_ODIR) -I$(COMMON_DIR)
GENERAL_SRC = $(CL_COMMON_SRC) \

6
qw_common/bothdefs.h
View File

@ -26,12 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef _BOTHDEFS_H
#define _BOTHDEFS_H
#if (defined(_M_IX86) || defined(__i386__))
#define id386 1
#else
#define id386 0
#endif
#ifdef SERVERONLY // no asm in dedicated server
#undef id386
#endif

7
uquake/Makefile.in
View File

@ -24,6 +24,7 @@ LDFLAGS = @LDFLAGS@ @SOUND_LIBS@ @NET_LIBS@ -lm
LIBS = @LIBS@
CC = @CC@
INTEL_ARCH = @INTEL_ARCH@
NO_ASMOPT = @NO_ASMOPT@
ifneq ($(SRC_DIR),.)
SRC_DIR_INC = -I$(SRC_DIR)
@ -114,10 +115,11 @@ all: $(targets)
# Source files
#
ifeq ($(INTEL_ARCH),yes)
ifneq ($(NO_ASMOPT),yes)
# Source file the Intel archictecture only
CFLAGS = -Did386=1
UQ_GENERAL_SRC = worlda.s
UQ_SWREND_SRC_PLAT = dosasm.s
CL_ADDITIONAL_GENERAL_SRC = sys_dosa.s math.s
@ -128,6 +130,7 @@ else
# Source files for non-Intel platforms
CFLAGS = -Did386=0
SWREND_SRC_PLAT = nonintel.c
endif
@ -190,7 +193,7 @@ CL_COMMON_SRC = $(MISC_SRC) $(CL_GUI_SRC) $(CL_SRC) \
# Directory specific stuff
#
DEFS = @DEFS@
CFLAGS = @CFLAGS@ $(OPTFLAGS) $(DEFS) -I. $(SRC_DIR_INC) \
CFLAGS += @CFLAGS@ $(OPTFLAGS) $(DEFS) -I. $(SRC_DIR_INC) \
-I$(COMMON_ODIR) -I$(COMMON_DIR) -DUQUAKE
GENERAL_SRC = $(CL_COMMON_SRC) \

6
uquake/quakedef.h
View File

@ -28,12 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#endif
#endif
#if defined __i386__ // && !defined __sun__
#define id386 1
#else
#define id386 0
#endif
#if id386
#define UNALIGNED_OK 1 // set to 0 if unaligned accesses are not supported
#else