quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove MAC_STATIC hack

Browse Source
This commit is contained in:
Garux 2021-01-21 16:17:23 +03:00
parent f3c26c791f
commit 0ab896b84a
3 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/quake3/q3map2/mesh.cpp
View File

@ -381,8 +381,7 @@ mesh_t *SubdivideMesh( mesh_t in, float maxError, float minLength ){
float len; float len;
mesh_t out; mesh_t out;
/* ydnar: static for os x */ bspDrawVert_t expand[MAX_EXPANDED_AXIS][MAX_EXPANDED_AXIS];
MAC_STATIC bspDrawVert_t expand[MAX_EXPANDED_AXIS][MAX_EXPANDED_AXIS];
out.width = in.width; out.width = in.width;
@ -547,8 +546,7 @@ mesh_t *SubdivideMesh2( mesh_t in, int iterations ){
bspDrawVert_t prev, next, mid; bspDrawVert_t prev, next, mid;
mesh_t out; mesh_t out;
/* ydnar: static for os x */ bspDrawVert_t expand[ MAX_EXPANDED_AXIS ][ MAX_EXPANDED_AXIS ];
MAC_STATIC bspDrawVert_t expand[ MAX_EXPANDED_AXIS ][ MAX_EXPANDED_AXIS ];
/* initial setup */ /* initial setup */
@ -654,8 +652,7 @@ mesh_t *RemoveLinearMeshColumnsRows( mesh_t *in ) {
vec3_t proj, dir; vec3_t proj, dir;
mesh_t out; mesh_t out;
/* ydnar: static for os x */ bspDrawVert_t expand[MAX_EXPANDED_AXIS][MAX_EXPANDED_AXIS];
MAC_STATIC bspDrawVert_t expand[MAX_EXPANDED_AXIS][MAX_EXPANDED_AXIS];
out.width = in->width; out.width = in->width;

7
tools/quake3/q3map2/patch.cpp
View File

@ -424,10 +424,9 @@ void PatchMapDrawSurfs( entity_t *e ){
vec3_t bounds[ 2 ]; vec3_t bounds[ 2 ];
byte *bordering; byte *bordering;
/* ydnar: mac os x fails with these if not static */ parseMesh_t *meshes[ MAX_MAP_DRAW_SURFS ];
MAC_STATIC parseMesh_t *meshes[ MAX_MAP_DRAW_SURFS ]; bool grouped[ MAX_MAP_DRAW_SURFS ];
MAC_STATIC bool grouped[ MAX_MAP_DRAW_SURFS ]; byte group[ MAX_MAP_DRAW_SURFS ];
MAC_STATIC byte group[ MAX_MAP_DRAW_SURFS ];
/* note it */ /* note it */

7
tools/quake3/q3map2/q3map2.h
View File

@ -98,13 +98,6 @@
------------------------------------------------------------------------------- */ ------------------------------------------------------------------------------- */
#define MAC_STATIC_HACK 0
#if defined( __APPLE__ ) && MAC_STATIC_HACK
#define MAC_STATIC static
#else
#define MAC_STATIC
#endif
/* macro version */ /* macro version */
#define VectorMA( a, s, b, c ) ( ( c )[ 0 ] = ( a )[ 0 ] + ( s ) * ( b )[ 0 ], ( c )[ 1 ] = ( a )[ 1 ] + ( s ) * ( b )[ 1 ], ( c )[ 2 ] = ( a )[ 2 ] + ( s ) * ( b )[ 2 ] ) #define VectorMA( a, s, b, c ) ( ( c )[ 0 ] = ( a )[ 0 ] + ( s ) * ( b )[ 0 ], ( c )[ 1 ] = ( a )[ 1 ] + ( s ) * ( b )[ 1 ], ( c )[ 2 ] = ( a )[ 2 ] + ( s ) * ( b )[ 2 ] )