tech
/
engine
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5224 fc73d0e0-1445-4013-8a0c-d673dee63da5

This commit is contained in:
Spoike 2018-03-06 17:01:53 +00:00
parent 8e3b3e0f0c
commit 986131b191
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/Makefile
View File

@ -1887,7 +1887,7 @@ endif
plugins-dbg: plugins-dbg:
@-mkdir -p $(DEBUG_DIR) @-mkdir -p $(DEBUG_DIR)
@if test -e ../plugins/Makefile; \ @if test -e ../plugins/Makefile; \
then $(MAKE) native -C ../plugins OUT_DIR="$(DEBUG_DIR)" CC="$(CC) $(W32_CFLAGS) $(DEBUG_CFLAGS)" BASE_CFLAGS="$(BASE_CFLAGS)" FTE_TARGET="$(FTE_TARGET)"; \ then $(MAKE) native -C ../plugins OUT_DIR="$(DEBUG_DIR)" CC="$(CC) $(W32_CFLAGS) $(DEBUG_CFLAGS)" ARCH="$(ARCH)" BASE_CFLAGS="$(BASE_CFLAGS)" FTE_TARGET="$(FTE_TARGET)"; \
else echo no plugins directory installed; \ else echo no plugins directory installed; \
fi fi
plugins: plugins:
@ -1895,7 +1895,7 @@ plugins:
plugins-rel: plugins-rel:
@-mkdir -p $(RELEASE_DIR) @-mkdir -p $(RELEASE_DIR)
@if test -e ../plugins/Makefile; \ @if test -e ../plugins/Makefile; \
then $(MAKE) native -C ../plugins OUT_DIR="$(RELEASE_DIR)" CC="$(CC) $(W32_CFLAGS) $(RELEASE_CFLAGS)" BASE_CFLAGS="$(BASE_CFLAGS)" FTE_TARGET="$(FTE_TARGET)"; \ then $(MAKE) native -C ../plugins OUT_DIR="$(RELEASE_DIR)" CC="$(CC) $(W32_CFLAGS) $(RELEASE_CFLAGS)" ARCH="$(ARCH)" BASE_CFLAGS="$(BASE_CFLAGS)" FTE_TARGET="$(FTE_TARGET)"; \
else echo no plugins directory installed; \ else echo no plugins directory installed; \
fi fi
plugins-rel: plugins-rel:

2
engine/gl/gl_vidlinuxglx.c
View File

@ -3201,7 +3201,9 @@ qboolean X11VID_Init (rendererstate_t *info, unsigned char *palette, int psl)
GLVID_Shutdown(); GLVID_Shutdown();
return false; return false;
} }
#if defined(USE_EGL) || defined(VKQUAKE)
if (visinfo != &vinfodef) if (visinfo != &vinfodef)
#endif
x11.pXFree(visinfo); x11.pXFree(visinfo);
break; break;
#ifdef USE_EGL #ifdef USE_EGL