teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 17:01:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

MSVC build fixes. The change to Makefile.deps is slightly questionable but it's not really an issue.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3613 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2013-03-27 01:38:21 +00:00
parent 26fc1aa4f8
commit 7f4185198c
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
polymer/eduke32/Makefile.deps
View file

@ -31,10 +31,7 @@ duke3d_h=\
gamedef_h=$(SRC)/gamedef.h $(SRC)/gameexec.h $(SRC)/gamevars.h
game_defs_dep=
ifneq ($(LUNATIC),0)
game_defs_dep=$(SRC)/lunatic/defs.ilua
endif
game_defs_dep=$(SRC)/lunatic/defs.ilua
$(OBJ)/game.$o: $(SRC)/game.c $(game_defs_dep) $(SRC)/jmact/scriplib.h $(duke3d_h) $(SRC)/input.h $(INC)/osdfuncs.h $(INC)/osdcmds.h $(INC)/grpscan.h $(INC)/demo.h $(EINC)/hightile.h
$(OBJ)/actors.$o: $(SRC)/actors.c $(duke3d_h)

2
polymer/eduke32/source/premap.c
View file

@ -1063,7 +1063,7 @@ static inline void prelevel(char g)
{
int32_t i, nexti, j, startwall, endwall;
int32_t switchpicnum;
uint8_t *tagbitmap = Bcalloc(65536>>3, 1);
uint8_t *tagbitmap = (uint8_t *)Bcalloc(65536>>3, 1);
if (tagbitmap==NULL)
G_GameExit("OUT OF MEMORY in prelevel()");