Fix the build with USE_OPENGL=0.

git-svn-id: https://svn.eduke32.com/eduke32@1810 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
plagman 2011-02-27 22:11:39 +00:00
parent fedab48ad2
commit 4f9699e03b
3 changed files with 13 additions and 7 deletions

View file

@ -7894,9 +7894,9 @@ void delete_maphack_lights() {}
// //
// loadmaphack // loadmaphack
// //
#if defined(POLYMOST) && defined(USE_OPENGL)
int32_t loadmaphack(const char *filename) int32_t loadmaphack(const char *filename)
{ {
#if defined(POLYMOST) && defined(USE_OPENGL)
enum enum
{ {
T_EOF = -2, T_EOF = -2,
@ -8178,10 +8178,11 @@ int32_t loadmaphack(const char *filename)
scriptfile_close(script); scriptfile_close(script);
return 0; return 0;
}
#else #else
int32_t loadmaphack(char *filename) { UNREFERENCED_PARAMETER(filename); return -1; } UNREFERENCED_PARAMETER(filename);
return -1;
#endif #endif
}
// //
@ -8519,7 +8520,7 @@ void nextpage(void)
if ((totalclock >= lastageclock+CACHEAGETIME) || (totalclock < lastageclock)) if ((totalclock >= lastageclock+CACHEAGETIME) || (totalclock < lastageclock))
{ lastageclock = totalclock; agecache(); } { lastageclock = totalclock; agecache(); }
#ifdef USE_OPENGL #if defined(POLYMOST) && defined(USE_OPENGL)
omdtims = mdtims; mdtims = getticks(); omdtims = mdtims; mdtims = getticks();
{ {

View file

@ -303,7 +303,10 @@ int32_t initsystem(void)
} }
else else
*/ */
novideo = nogl = 1; novideo = 1;
#ifdef USE_OPENGL
nogl = 1;
#endif
} }
signal(SIGSEGV, sighandler); signal(SIGSEGV, sighandler);
@ -987,7 +990,7 @@ int32_t setvideomode(int32_t x, int32_t y, int32_t c, int32_t fs)
if (lockcount) while (lockcount) enddrawing(); if (lockcount) while (lockcount) enddrawing();
#if defined(USE_OPENGL) #if defined(POLYMOST) && defined(USE_OPENGL)
if (bpp > 8 && sdl_surface) polymost_glreset(); if (bpp > 8 && sdl_surface) polymost_glreset();
#endif #endif
@ -998,7 +1001,7 @@ int32_t setvideomode(int32_t x, int32_t y, int32_t c, int32_t fs)
gammabrightness = 0; // redetect on next mode switch gammabrightness = 0; // redetect on next mode switch
} }
#if defined(USE_OPENGL) #if defined(POLYMOST) && defined(USE_OPENGL)
if (c > 8) if (c > 8)
{ {
int32_t i, j, multisamplecheck = (glmultisample > 0); int32_t i, j, multisamplecheck = (glmultisample > 0);

View file

@ -1341,8 +1341,10 @@ static uint32_t calcsz(const dataspec_t *spec)
} }
static void sv_postudload(); static void sv_postudload();
#if defined(POLYMOST) && defined(USE_OPENGL)
static void sv_prespriteextsave(); static void sv_prespriteextsave();
static void sv_postspriteext(); static void sv_postspriteext();
#endif
static void sv_calcbitptrsize(); static void sv_calcbitptrsize();
static void sv_prescriptsave_once(); static void sv_prescriptsave_once();
static void sv_prescriptload_once(); static void sv_prescriptload_once();