mirror of
https://github.com/ZDoom/Raze.git
synced 2024-11-16 01:11:44 +00:00
MSVC build fixes. The change to Makefile.deps is slightly questionable but it's not really an issue.
git-svn-id: https://svn.eduke32.com/eduke32@3613 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
26fc1aa4f8
commit
7f4185198c
2 changed files with 2 additions and 5 deletions
|
@ -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)
|
||||
|
|
|
@ -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()");
|
||||
|
|
Loading…
Reference in a new issue