fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Spoike 2015-04-22 00:27:59 +00:00
parent 18e0176f70
commit ad641efab3
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
engine/Makefile
View file

@ -1564,7 +1564,7 @@ scintilla$(BITS)_static:
@$(MAKE) reldir OUT_DIR=$(RELEASE_DIR)/qcc @$(MAKE) reldir OUT_DIR=$(RELEASE_DIR)/qcc
@$(MAKE) $(RELEASE_DIR)/scintilla$(BITS).a VPATH="$(SCINTILLA_DIRS)" CFLAGS="$(SCINTILLA_INC) -DDISABLE_D2D -DSTATIC_BUILD -DSCI_LEXER" OUT_DIR=$(RELEASE_DIR)/qcc WCFLAGS="$(WCFLAGS) -Os" @$(MAKE) $(RELEASE_DIR)/scintilla$(BITS).a VPATH="$(SCINTILLA_DIRS)" CFLAGS="$(SCINTILLA_INC) -DDISABLE_D2D -DSTATIC_BUILD -DSCI_LEXER" OUT_DIR=$(RELEASE_DIR)/qcc WCFLAGS="$(WCFLAGS) -Os"
qccgui-scintilla: scintilla$(BITS)_static qccgui-scintilla: scintilla$(BITS)_static
@$(MAKE) _qcc-tmp TYPE=_out-rel REQDIR=reldir EXE_NAME="../fteqccgui" OUT_DIR="$(RELEASE_DIR)/qcc" SOBJS="qccgui.o qccguistuff.o" WCFLAGS="$(WCFLAGS) -DSCISTATIC" LDFLAGS="$(LDFLAGS) $(RELEASE_DIR)/scintilla$(BITS).a -static -luuid -lole32 -limm32 -lstdc++ -lcomdlg32 -lcomctl32 -mwindows" @$(MAKE) _qcc-tmp TYPE=_out-rel REQDIR=reldir EXE_NAME="../fteqccgui" OUT_DIR="$(RELEASE_DIR)/qcc" SOBJS="qccgui.o qccguistuff.o" WCFLAGS="$(WCFLAGS) -DSCISTATIC" LDFLAGS="$(LDFLAGS) $(RELEASE_DIR)/scintilla$(BITS).a -static -luuid -lole32 -limm32 -lstdc++ -lcomdlg32 -lcomctl32 -lshlwapi -mwindows"
ifdef windir ifdef windir
debugdir: debugdir:

12
engine/gl/gl_model.c
View file

@ -273,6 +273,8 @@ int RelightThread(void *arg)
free(threadctx); free(threadctx);
return 0; return 0;
} }
#else
void *lightmainthreadctx;
#endif #endif
void Mod_Think (void) void Mod_Think (void)
@ -315,7 +317,9 @@ void Mod_Think (void)
return; return;
} }
#else #else
LightFace(lightcontext, relitsurface); if (!lightmainthreadctx)
lightmainthreadctx = malloc(lightthreadctxsize);
LightFace(lightcontext, lightmainthreadctx, relitsurface);
Mod_UpdateLightmap(relitsurface); Mod_UpdateLightmap(relitsurface);
relitsurface++; relitsurface++;
@ -338,6 +342,9 @@ void Mod_Think (void)
} }
relightthreads = 0; relightthreads = 0;
} }
#else
free(lightmainthreadctx);
lightmainthreadctx = NULL;
#endif #endif
LightShutdown(lightcontext, lightmodel); LightShutdown(lightcontext, lightmodel);
@ -447,6 +454,9 @@ void Mod_ClearAll (void)
relightthread[i] = NULL; relightthread[i] = NULL;
} }
relightthreads = 0; relightthreads = 0;
#else
free(lightmainthreadctx);
lightmainthreadctx = NULL;
#endif #endif
lightmodel = NULL; lightmodel = NULL;
#endif #endif