zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-12 03:00:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix Lunatic C build. DONT_BUILD.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4765 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2014-11-26 04:37:22 +00:00
parent 112d650843
commit d89caf5187
3 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polymer/eduke32/build/include/baselayer.h
View file

@ -170,7 +170,7 @@ extern int32_t inputchecked;
int32_t inittimer(int32_t); int32_t inittimer(int32_t);
void uninittimer(void); void uninittimer(void);
void sampletimer(void); void sampletimer(void);
#ifdef RENDERTYPESDL #if defined RENDERTYPESDL && !defined LUNATIC
static inline uint32_t getticks(void) { return (uint32_t)SDL_GetTicks(); } static inline uint32_t getticks(void) { return (uint32_t)SDL_GetTicks(); }
#else #else
uint32_t getticks(void); uint32_t getticks(void);

10
polymer/eduke32/build/src/sdlayer.c
View file

@ -901,6 +901,16 @@ void sampletimer(void)
for (; n > 0; n--) usertimercallback(); for (; n > 0; n--) usertimercallback();
} }
#if defined LUNATIC
//
// getticks() -- returns the sdl ticks count
//
uint32_t getticks(void)
{
return (uint32_t)SDL_GetTicks();
}
#endif
// high-resolution timers for profiling // high-resolution timers for profiling
#if SDL_MAJOR_VERSION!=1 #if SDL_MAJOR_VERSION!=1

10
polymer/eduke32/source/astub.c
View file

@ -10826,7 +10826,10 @@ static void med_handlecommon(int32_t xpos, int32_t ypos, int32_t *row, int32_t r
static void EditSectorData(int16_t sectnum) static void EditSectorData(int16_t sectnum)
{ {
int32_t col=1, row=0, rowmax = 6, i = -1; int32_t col=1, row=0, rowmax = 6;
#ifdef YAX_ENABLE__COMPAT
int32_t i = -1;
#endif
int32_t xpos = 208, ypos = ydim-STATUS2DSIZ+48; int32_t xpos = 208, ypos = ydim-STATUS2DSIZ+48;
med_editval = 0; med_editval = 0;
@ -10982,7 +10985,10 @@ static void EditSectorData(int16_t sectnum)
static void EditWallData(int16_t wallnum) static void EditWallData(int16_t wallnum)
{ {
int32_t row=0, i = -1; int32_t row=0;
#if !defined NEW_MAP_FORMAT
int32_t i = -1;
#endif
int32_t xpos = 208, ypos = ydim-STATUS2DSIZ+48; int32_t xpos = 208, ypos = ydim-STATUS2DSIZ+48;
med_editval = 0; med_editval = 0;