mirror of
https://git.code.sf.net/p/quake/quake2forge
synced 2024-12-13 14:11:35 +00:00
- Removed traces of C_ONLY, replaced with HAVE_MASM
This commit is contained in:
parent
c25b318fc2
commit
309c37b9c2
8 changed files with 16 additions and 10 deletions
1
TODO
1
TODO
|
@ -7,3 +7,4 @@
|
|||
- 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
|
||||
/usr/share/games/quake2, for example
|
||||
- go through code and hunt down assert()s
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
# $Id$
|
||||
|
||||
# swap comments to build the modpacks
|
||||
SUBDIRS = . baseq2 ctf
|
||||
#SUBDIRS = . baseq2 ctf xatrix rogue
|
||||
#SUBDIRS = . baseq2 ctf
|
||||
SUBDIRS = . baseq2 ctf xatrix rogue
|
||||
|
||||
bin_PROGRAMS = quake2 \
|
||||
ref_soft.so ref_softx.so ref_softsdl.so \
|
||||
|
|
|
@ -267,7 +267,7 @@ float Q_fabs (float f)
|
|||
#endif
|
||||
}
|
||||
|
||||
#if defined _M_IX86 && !defined C_ONLY
|
||||
#ifdef HAVE_MASM
|
||||
#pragma warning (disable:4035)
|
||||
__declspec( naked ) long Q_ftol( float f )
|
||||
{
|
||||
|
|
|
@ -48,13 +48,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
#else
|
||||
#define id386 0
|
||||
#endif
|
||||
*/
|
||||
|
||||
#if defined _M_ALPHA && !defined C_ONLY
|
||||
#define idaxp 1
|
||||
#else
|
||||
#define idaxp 0
|
||||
#endif
|
||||
*/
|
||||
|
||||
typedef unsigned char byte;
|
||||
typedef enum {false, true} qboolean;
|
||||
|
@ -147,10 +147,11 @@ extern vec3_t vec3_origin;
|
|||
|
||||
#define IS_NAN(x) (((*(int *)&x)&nanmask)==nanmask)
|
||||
|
||||
/* FIXME: (jaq) use them C99 functions instead */
|
||||
// microsoft's fabs seems to be ungodly slow...
|
||||
//float Q_fabs (float f);
|
||||
//#define fabs(f) Q_fabs(f)
|
||||
#if !defined C_ONLY && defined _WIN32
|
||||
#ifdef HAVE_MASM
|
||||
extern long Q_ftol( float f );
|
||||
#else
|
||||
#define Q_ftol( f ) ( long ) (f)
|
||||
|
|
|
@ -261,7 +261,7 @@ float Q_fabs (float f)
|
|||
#endif
|
||||
}
|
||||
|
||||
#if defined _M_IX86 && !defined C_ONLY
|
||||
#ifdef HAVE_MASM
|
||||
#pragma warning (disable:4035)
|
||||
__declspec( naked ) long Q_ftol( float f )
|
||||
{
|
||||
|
|
|
@ -48,11 +48,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
#endif
|
||||
*/
|
||||
|
||||
/*
|
||||
#if defined _M_ALPHA && !defined C_ONLY
|
||||
#define idaxp 1
|
||||
#else
|
||||
#define idaxp 0
|
||||
#endif
|
||||
*/
|
||||
|
||||
typedef unsigned char byte;
|
||||
typedef enum {false, true} qboolean;
|
||||
|
@ -145,10 +147,11 @@ extern vec3_t vec3_origin;
|
|||
|
||||
#define IS_NAN(x) (((*(int *)&x)&nanmask)==nanmask)
|
||||
|
||||
/* FIXME: (jaq) use them C99 functions instead */
|
||||
// microsoft's fabs seems to be ungodly slow...
|
||||
//float Q_fabs (float 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 );
|
||||
#else
|
||||
#define Q_ftol( f ) ( long ) (f)
|
||||
|
|
|
@ -261,7 +261,7 @@ float Q_fabs (float f)
|
|||
#endif
|
||||
}
|
||||
|
||||
#if defined _M_IX86 && !defined C_ONLY
|
||||
#ifdef HAVE_MASM
|
||||
#pragma warning (disable:4035)
|
||||
__declspec( naked ) long Q_ftol( float f )
|
||||
{
|
||||
|
|
|
@ -48,13 +48,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
#else
|
||||
#define id386 0
|
||||
#endif
|
||||
*/
|
||||
|
||||
#if defined _M_ALPHA && !defined C_ONLY
|
||||
#define idaxp 1
|
||||
#else
|
||||
#define idaxp 0
|
||||
#endif
|
||||
*/
|
||||
|
||||
typedef unsigned char byte;
|
||||
typedef enum {false, true} qboolean;
|
||||
|
@ -147,10 +147,11 @@ extern vec3_t vec3_origin;
|
|||
|
||||
#define IS_NAN(x) (((*(int *)&x)&nanmask)==nanmask)
|
||||
|
||||
/* FIXME: (jaq) use them C99 functions instead */
|
||||
// microsoft's fabs seems to be ungodly slow...
|
||||
//float Q_fabs (float f);
|
||||
//#define fabs(f) Q_fabs(f)
|
||||
#if !defined C_ONLY && defined _WIN32
|
||||
#ifdef HAVE_MASM
|
||||
extern long Q_ftol( float f );
|
||||
#else
|
||||
#define Q_ftol( f ) ( long ) (f)
|
||||
|
|
Loading…
Reference in a new issue