qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-17 22:50:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

this should fix static win32 builds

Browse source
This commit is contained in:
Bill Currie 2004-01-21 00:15:35 +00:00
parent 9aa9d4e3dc
commit 19ef80c555
3 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/QF/mathlib.h
View file

@ -36,18 +36,8 @@
# define M_PI 3.14159265358979323846 // matches value in gcc v2 math.h
#endif
#ifdef _WIN32
# if defined (DLL_EXPORT) && defined (BUILD_QFutil)
# define QFutil_IMPORT
# else
# define QFutil_IMPORT __declspec(dllimport)
# endif
#else
# define QFutil_IMPORT
#endif
extern int nanmask;
extern QFutil_IMPORT const vec3_t vec3_origin;
extern const vec_t * const vec3_origin;
#define EQUAL_EPSILON 0.001
#define RINT(x) (floor ((x) + 0.5))
@ -148,7 +138,7 @@ void RotatePointAroundVector (vec3_t dst, const vec3_t axis,
#define PlaneDiff(point,plane) (((plane)->type < 3 ? (point)[(plane)->type] : DotProduct((point), (plane)->normal)) - (plane)->dist)
extern QFutil_IMPORT mplane_t frustum[4];
extern mplane_t * const frustum;
extern inline qboolean R_CullBox (const vec3_t mins, const vec3_t maxs);
extern inline qboolean R_CullSphere (const vec3_t origin, const float radius);
extern inline float VectorNormalize (vec3_t v); // returns vector length

4
libs/util/Makefile.am
View file

@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS= foreign
AM_CFLAGS= @PREFER_PIC@ -DBUILD_QFutil
AM_CCASFLAGS= @PREFER_PIC@ -DBUILD_QFutil
AM_CFLAGS= @PREFER_PIC@
AM_CCASFLAGS= @PREFER_PIC@
INCLUDES= -I$(top_srcdir)/include
lib_LTLIBRARIES= libQFutil.la

6
libs/util/mathlib.c
View file

@ -48,8 +48,10 @@ static __attribute__ ((unused)) const char rcsid[] =
#include "QF/sys.h"
int nanmask = 255 << 23;
mplane_t frustum[4];
const vec3_t vec3_origin = { 0, 0, 0 };
static mplane_t _frustum[4];
mplane_t *const frustum = _frustum;
static vec3_t _vec3_origin = { 0, 0, 0 };
const vec_t * const vec3_origin = _vec3_origin;
#define DEG2RAD(a) (a * (M_PI / 180.0))