teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-19 07:31:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix build issues with ARM and USE_OPENGL=0. DONT_BUILD.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6651 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2018-02-15 03:49:23 +00:00
parent 8094104f0b
commit ff0768eaa9
5 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
source/build/include/build.h
View file

@ -860,8 +860,8 @@ extern int32_t usevoxels, voxscale[MAXVOXELS];
#ifdef USE_OPENGL #ifdef USE_OPENGL
extern int32_t usemodels, usehightile; extern int32_t usemodels, usehightile;
extern int32_t rendmode; extern int32_t rendmode;
extern uint8_t globalr, globalg, globalb;
#endif #endif
extern uint8_t globalr, globalg, globalb;
EXTERN uint16_t h_xsize[MAXTILES], h_ysize[MAXTILES]; EXTERN uint16_t h_xsize[MAXTILES], h_ysize[MAXTILES];
EXTERN int8_t h_xoffs[MAXTILES], h_yoffs[MAXTILES]; EXTERN int8_t h_xoffs[MAXTILES], h_yoffs[MAXTILES];
@ -1288,6 +1288,12 @@ void polymost_precache(int32_t dapicnum, int32_t dapalnum, int32_t datype);
typedef uint16_t polytintflags_t; typedef uint16_t polytintflags_t;
enum cutsceneflags {
CUTSCENE_FORCEFILTER = 1,
CUTSCENE_FORCENOFILTER = 2,
CUTSCENE_TEXTUREFILTER = 4,
};
#ifdef USE_OPENGL #ifdef USE_OPENGL
extern int32_t glanisotropy; extern int32_t glanisotropy;
extern int32_t glusetexcompr; extern int32_t glusetexcompr;
@ -1298,12 +1304,6 @@ enum {
TEXFILTER_ON = 5, // GL_LINEAR_MIPMAP_LINEAR TEXFILTER_ON = 5, // GL_LINEAR_MIPMAP_LINEAR
}; };
enum cutsceneflags {
CUTSCENE_FORCEFILTER = 1,
CUTSCENE_FORCENOFILTER = 2,
CUTSCENE_TEXTUREFILTER = 4,
};
extern int32_t glusetexcache, glusememcache; extern int32_t glusetexcache, glusememcache;
extern int32_t glmultisample, glnvmultisamplehint; extern int32_t glmultisample, glnvmultisamplehint;
extern int32_t glprojectionhacks; extern int32_t glprojectionhacks;

2
source/build/include/compat.h
View file

@ -606,7 +606,7 @@ static FORCE_INLINE int32_t Blrintf(const float x)
return n; return n;
} }
#else #else
#define Blrintf lrintf #define Blrintf(x) ((int32_t)lrintf(x))
#endif #endif
#if defined(__arm__) #if defined(__arm__)

2
source/build/src/engine.cpp
View file

@ -92,6 +92,8 @@ static inline int32_t oldnonpow2(void)
#endif #endif
} }
uint8_t globalr = 255, globalg = 255, globalb = 255;
int16_t pskybits_override = -1; int16_t pskybits_override = -1;
//void loadvoxel(int32_t voxindex) { UNREFERENCED_PARAMATER(voxindex); } //void loadvoxel(int32_t voxindex) { UNREFERENCED_PARAMATER(voxindex); }

3
source/build/src/hightile.cpp
View file

@ -294,6 +294,9 @@ void hicsetpalettetint(int32_t palnum, char r, char g, char b, char sr, char sg,
UNREFERENCED_PARAMETER(r); UNREFERENCED_PARAMETER(r);
UNREFERENCED_PARAMETER(g); UNREFERENCED_PARAMETER(g);
UNREFERENCED_PARAMETER(b); UNREFERENCED_PARAMETER(b);
UNREFERENCED_PARAMETER(sr);
UNREFERENCED_PARAMETER(sg);
UNREFERENCED_PARAMETER(sb);
UNREFERENCED_PARAMETER(effect); UNREFERENCED_PARAMETER(effect);
} }
int32_t hicsetsubsttex(int32_t picnum, int32_t palnum, const char *filen, float alphacut) int32_t hicsetsubsttex(int32_t picnum, int32_t palnum, const char *filen, float alphacut)

1
source/build/src/polymost.cpp
View file

@ -32,7 +32,6 @@ extern char textfont[2048], smalltextfont[2048];
int32_t rendmode=0; int32_t rendmode=0;
int32_t usemodels=1; int32_t usemodels=1;
int32_t usehightile=1; int32_t usehightile=1;
uint8_t globalr=255, globalg=255, globalb=255;
typedef struct { float x, cy[2], fy[2]; int32_t tag; int16_t n, p, ctag, ftag; } vsptyp; typedef struct { float x, cy[2], fy[2]; int32_t tag; int16_t n, p, ctag, ftag; } vsptyp;
#define VSPMAX 2048 //<- careful! #define VSPMAX 2048 //<- careful!