qf/quake2forge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quake2forge synced 2024-12-12 13:42:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Removed traces of C_ONLY, replaced with HAVE_MASM

Browse source
This commit is contained in:
Jamie Wilkinson 2002-04-12 12:41:24 +00:00
parent c25b318fc2
commit 309c37b9c2
8 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
TODO
View file

@ -7,3 +7,4 @@
- use DATADIR to find game data, rather than in same directory as libraries - use DATADIR to find game data, rather than in same directory as libraries
this way, it can follow FHS: libs in /usr/lib/games/quake2 and data in this way, it can follow FHS: libs in /usr/lib/games/quake2 and data in
/usr/share/games/quake2, for example /usr/share/games/quake2, for example
- go through code and hunt down assert()s

4
src/Makefile.am
View file

@ -1,8 +1,8 @@
# $Id$ # $Id$
# swap comments to build the modpacks # swap comments to build the modpacks
SUBDIRS = . baseq2 ctf #SUBDIRS = . baseq2 ctf
#SUBDIRS = . baseq2 ctf xatrix rogue SUBDIRS = . baseq2 ctf xatrix rogue
bin_PROGRAMS = quake2 \ bin_PROGRAMS = quake2 \
ref_soft.so ref_softx.so ref_softsdl.so \ ref_soft.so ref_softx.so ref_softsdl.so \

2
src/baseq2/q_shared.c
View file

@ -267,7 +267,7 @@ float Q_fabs (float f)
#endif #endif
} }
#if defined _M_IX86 && !defined C_ONLY #ifdef HAVE_MASM
#pragma warning (disable:4035) #pragma warning (disable:4035)
__declspec( naked ) long Q_ftol( float f ) __declspec( naked ) long Q_ftol( float f )
{ {

5
src/baseq2/q_shared.h
View file

@ -48,13 +48,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#else #else
#define id386 0 #define id386 0
#endif #endif
*/
#if defined _M_ALPHA && !defined C_ONLY #if defined _M_ALPHA && !defined C_ONLY
#define idaxp 1 #define idaxp 1
#else #else
#define idaxp 0 #define idaxp 0
#endif #endif
*/
typedef unsigned char byte; typedef unsigned char byte;
typedef enum {false, true} qboolean; typedef enum {false, true} qboolean;
@ -147,10 +147,11 @@ extern vec3_t vec3_origin;
#define IS_NAN(x) (((*(int *)&x)&nanmask)==nanmask) #define IS_NAN(x) (((*(int *)&x)&nanmask)==nanmask)
/* FIXME: (jaq) use them C99 functions instead */
// microsoft's fabs seems to be ungodly slow... // microsoft's fabs seems to be ungodly slow...
//float Q_fabs (float f); //float Q_fabs (float f);
//#define fabs(f) Q_fabs(f) //#define fabs(f) Q_fabs(f)
#if !defined C_ONLY && defined _WIN32 #ifdef HAVE_MASM
extern long Q_ftol( float f ); extern long Q_ftol( float f );
#else #else
#define Q_ftol( f ) ( long ) (f) #define Q_ftol( f ) ( long ) (f)

2
src/ctf/q_shared.c
View file

@ -261,7 +261,7 @@ float Q_fabs (float f)
#endif #endif
} }
#if defined _M_IX86 && !defined C_ONLY #ifdef HAVE_MASM
#pragma warning (disable:4035) #pragma warning (disable:4035)
__declspec( naked ) long Q_ftol( float f ) __declspec( naked ) long Q_ftol( float f )
{ {

5
src/ctf/q_shared.h
View file

@ -48,11 +48,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#endif #endif
*/ */
/*
#if defined _M_ALPHA && !defined C_ONLY #if defined _M_ALPHA && !defined C_ONLY
#define idaxp 1 #define idaxp 1
#else #else
#define idaxp 0 #define idaxp 0
#endif #endif
*/
typedef unsigned char byte; typedef unsigned char byte;
typedef enum {false, true} qboolean; typedef enum {false, true} qboolean;
@ -145,10 +147,11 @@ extern vec3_t vec3_origin;
#define IS_NAN(x) (((*(int *)&x)&nanmask)==nanmask) #define IS_NAN(x) (((*(int *)&x)&nanmask)==nanmask)
/* FIXME: (jaq) use them C99 functions instead */
// microsoft's fabs seems to be ungodly slow... // microsoft's fabs seems to be ungodly slow...
//float Q_fabs (float f); //float Q_fabs (float f);
//#define fabs(f) Q_fabs(f) //#define fabs(f) Q_fabs(f)
#if !defined C_ONLY && !defined __linux__ && !defined __FreeBSD__ && !defined __sgi #ifdef HAVE_MASM
extern long Q_ftol( float f ); extern long Q_ftol( float f );
#else #else
#define Q_ftol( f ) ( long ) (f) #define Q_ftol( f ) ( long ) (f)

2
src/q_shared.c
View file

@ -261,7 +261,7 @@ float Q_fabs (float f)
#endif #endif
} }
#if defined _M_IX86 && !defined C_ONLY #ifdef HAVE_MASM
#pragma warning (disable:4035) #pragma warning (disable:4035)
__declspec( naked ) long Q_ftol( float f ) __declspec( naked ) long Q_ftol( float f )
{ {

5
src/q_shared.h
View file

@ -48,13 +48,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#else #else
#define id386 0 #define id386 0
#endif #endif
*/
#if defined _M_ALPHA && !defined C_ONLY #if defined _M_ALPHA && !defined C_ONLY
#define idaxp 1 #define idaxp 1
#else #else
#define idaxp 0 #define idaxp 0
#endif #endif
*/
typedef unsigned char byte; typedef unsigned char byte;
typedef enum {false, true} qboolean; typedef enum {false, true} qboolean;
@ -147,10 +147,11 @@ extern vec3_t vec3_origin;
#define IS_NAN(x) (((*(int *)&x)&nanmask)==nanmask) #define IS_NAN(x) (((*(int *)&x)&nanmask)==nanmask)
/* FIXME: (jaq) use them C99 functions instead */
// microsoft's fabs seems to be ungodly slow... // microsoft's fabs seems to be ungodly slow...
//float Q_fabs (float f); //float Q_fabs (float f);
//#define fabs(f) Q_fabs(f) //#define fabs(f) Q_fabs(f)
#if !defined C_ONLY && defined _WIN32 #ifdef HAVE_MASM
extern long Q_ftol( float f ); extern long Q_ftol( float f );
#else #else
#define Q_ftol( f ) ( long ) (f) #define Q_ftol( f ) ( long ) (f)