Commit 68257c79 authored by Richard Gobeille's avatar Richard Gobeille

Build fix

parent 29354854
......@@ -366,7 +366,7 @@ PROFILER := 0
# For debugging with Valgrind + GDB, see
# http://valgrind.org/docs/manual/manual-core-adv.html#manual-core-adv.gdbserver
ALLOCACHE_AS_MALLOC := 0
MICROPROFILE := 0
##### Settings overrides and implicit cascades
......
......@@ -11,7 +11,6 @@ ifeq ($(FURY),1)
RETAIL_MENU := 1
STANDALONE := 1
USE_LIBVPX := 0
MICROPROFILE := 0
endif
### Platform and Toolchain Configuration
......
......@@ -8543,8 +8543,6 @@ int32_t enginePreInit(void)
#endif
preinitcalled = 1;
MicroProfileWebServerStart();
return 0;
}
......@@ -11092,6 +11090,17 @@ int32_t videoSetGameMode(char davidoption, int32_t daupscaledxdim, int32_t daups
}
#endif
#endif
#if MICROPROFILE_ENABLED == 1
static int webServerStarted;
if (!webServerStarted)
{
webServerStarted = true;
MicroProfileWebServerStart();
}
#endif
qsetmode = 200;
return 0;
}
......
......@@ -1429,7 +1429,9 @@ static void destroy_window_resources()
/* We should NOT destroy the window surface. This is done automatically
when SDL_DestroyWindow or SDL_SetVideoMode is called. */
#if MICROPROFILE_ENABLED != 0
MicroProfileGpuShutdown();
#endif
#if SDL_MAJOR_VERSION >= 2
if (sdl_context)
......@@ -1697,7 +1699,9 @@ int32_t videoSetMode(int32_t x, int32_t y, int32_t c, int32_t fs)
setvideomode_sdlcommonpost(x, y, c, fs, regrab);
#if MICROPROFILE_ENABLED != 0
MicroProfileGpuInitGL();
#endif
return 0;
}
......
......@@ -6365,7 +6365,7 @@ void G_DrawFrame(void)
G_DrawBackground();
G_DisplayRest(smoothRatio);
#if MICROPROFILE_ENABLED
#if MICROPROFILE_ENABLED != 0
for (auto &gv : aGameVars)
{
if ((gv.flags & (GAMEVAR_USER_MASK|GAMEVAR_PTR_MASK)) == 0)
......
......@@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "microprofile.h"
#if MICROPROFILE_ENABLED
#if MICROPROFILE_ENABLED != 0
MicroProfileToken g_eventTokens[MAXEVENTS];
MicroProfileToken g_actorTokens[MAXTILES];
MicroProfileToken g_statnumTokens[MAXSTATUS];
......@@ -6198,6 +6198,7 @@ void scriptInitTables()
inthash_add(&h_actorvar, actorvar.x, actorvar.y, 0);
}
#if MICROPROFILE_ENABLED != 0
static int C_GetLabelIndex(int32_t val, int type)
{
for (int i=0;i<g_labelCnt;i++)
......@@ -6210,6 +6211,7 @@ static int C_GetLabelIndex(int32_t val, int type)
return -1;
}
#endif
void C_Compile(const char *fileName)
{
......@@ -6352,7 +6354,7 @@ void C_Compile(const char *fileName)
C_InitQuotes();
#if MICROPROFILE_ENABLED
#if MICROPROFILE_ENABLED != 0
for (int i=0; i<MAXEVENTS; i++)
{
if (VM_HaveEvent(i))
......
......@@ -43,7 +43,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# define GAMEEXEC_STATIC static
#endif
#if MICROPROFILE_ENABLED
#if MICROPROFILE_ENABLED != 0
extern MicroProfileToken g_eventTokens[MAXEVENTS];
extern MicroProfileToken g_actorTokens[MAXTILES];
extern MicroProfileToken g_statnumTokens[MAXSTATUS];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment