zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-26 08:50:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Build tools:

Browse source 
- clearbufbyte --> Bmemset
 - add libm to $(UTILLIBS) to fix building of mkpalette
 - add self-explanatory Makefile commands: dxutils, sdlutils, printdxutils, printsdlutils

git-svn-id: https://svn.eduke32.com/eduke32@2597 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2012-04-08 07:23:24 +00:00
parent c35e1005b0
commit 5777eae026
2 changed files with 30 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
polymer/eduke32/build/Makefile
View file

@ -58,7 +58,7 @@ ifneq ($(LUNATIC),0)
OURCFLAGS+= -DLUNATIC_ENABLE OURCFLAGS+= -DLUNATIC_ENABLE
endif endif
UTILLIBS= # -lpthread UTILLIBS= -lm # -lpthread
UTILADDOBJS= UTILADDOBJS=
ifneq (0,$(NEDMALLOC)) ifneq (0,$(NEDMALLOC))
UTILADDOBJS+= $(OBJ)/nedmalloc.$o UTILADDOBJS+= $(OBJ)/nedmalloc.$o
@ -191,7 +191,7 @@ OURCFLAGS+= $(BUILDCFLAGS)
UTILOBJS=$(OBJ)/kextract.$o $(OBJ)/kgroup.$o $(OBJ)/transpal.$o $(OBJ)/wad2art.$o $(OBJ)/wad2map.$o $(OBJ)/kmd2tool.$o \ UTILOBJS=$(OBJ)/kextract.$o $(OBJ)/kgroup.$o $(OBJ)/transpal.$o $(OBJ)/wad2art.$o $(OBJ)/wad2map.$o $(OBJ)/kmd2tool.$o \
$(OBJ)/md2tool.$o \ $(OBJ)/md2tool.$o \
$(OBJ)/generateicon.$o $(OBJ)/cacheinfo.$o $(OBJ)/enumdisplay.$o $(OBJ)/arttool.$o $(OBJ)/givedepth.$o $(OBJ)/mkpalette.$o \ $(OBJ)/generateicon.$o $(OBJ)/cacheinfo.$o $(OBJ)/arttool.$o $(OBJ)/givedepth.$o $(OBJ)/mkpalette.$o \
$(OBJ)/unpackssi.$o $(OBJ)/bsuite.$o \ $(OBJ)/unpackssi.$o $(OBJ)/bsuite.$o \
$(OBJ)/compat.$o $(OBJ)/compat_tools.$o $(OBJ)/pragmas.$o $(OBJ)/kplib.$o $(OBJ)/cache1d.$o $(OBJ)/compat.$o $(OBJ)/compat_tools.$o $(OBJ)/pragmas.$o $(OBJ)/kplib.$o $(OBJ)/cache1d.$o
UTILS=kextract$(EXESUFFIX) kgroup$(EXESUFFIX) transpal$(EXESUFFIX) wad2art$(EXESUFFIX) wad2map$(EXESUFFIX) kmd2tool$(EXESUFFIX) \ UTILS=kextract$(EXESUFFIX) kgroup$(EXESUFFIX) transpal$(EXESUFFIX) wad2art$(EXESUFFIX) wad2map$(EXESUFFIX) kmd2tool$(EXESUFFIX) \
@ -199,16 +199,32 @@ UTILS=kextract$(EXESUFFIX) kgroup$(EXESUFFIX) transpal$(EXESUFFIX) wad2art$(EXES
generateicon$(EXESUFFIX) cacheinfo$(EXESUFFIX) arttool$(EXESUFFIX) givedepth$(EXESUFFIX) mkpalette$(EXESUFFIX) \ generateicon$(EXESUFFIX) cacheinfo$(EXESUFFIX) arttool$(EXESUFFIX) givedepth$(EXESUFFIX) mkpalette$(EXESUFFIX) \
unpackssi$(EXESUFFIX) bsuite$(EXESUFFIX) unpackssi$(EXESUFFIX) bsuite$(EXESUFFIX)
DXUTILOBJS=$(OBJ)/enumdisplay.$o $(OBJ)/getdxdidf.$o
DXUTILS=enumdisplay$(EXESUFFIX) getdxdidf$(EXESUFFIX)
SDLUTILOBJS=$(OBJ)/makesdlkeytrans.$o
SDLUTILS=makesdlkeytrans$(EXESUFFIX)
# all: $(OBJ)/$(ENGINELIB) $(OBJ)/$(EDITORLIB) # all: $(OBJ)/$(ENGINELIB) $(OBJ)/$(EDITORLIB)
utils: start $(UTILS) finish utils: start $(UTILS) finish utilfinish
dxutils: start $(DXUTILS) finish dxutilfinish
sdlutils: start $(SDLUTILS) finish sdlutilfinish
start: start:
$(BUILD_STARTED) $(BUILD_STARTED)
finish: finish:
$(BUILD_FINISHED) $(BUILD_FINISHED)
utilfinish:
@ls -l $(UTILS) @ls -l $(UTILS)
dxutilfinish:
@ls -l $(DXUTILS)
sdlutilfinish:
@ls -l $(SDLUTILS)
enginelib: $(OBJ)/$(ENGINELIB) enginelib: $(OBJ)/$(ENGINELIB)
$(OBJ)/$(ENGINELIB): $(ENGINEOBJS) $(OBJ)/$(ENGINELIB): $(ENGINEOBJS)
$(BUILD_ECHOFLAGS) $(BUILD_ECHOFLAGS)
@ -349,13 +365,17 @@ clean:
echo -n "" > $(OBJ)/keep.me echo -n "" > $(OBJ)/keep.me
cleanutils: cleanutils:
-rm -f $(UTILS) $(UTILOBJS) $(UTILADDOBJS) \ -rm -f $(UTILS) $(UTILOBJS) $(DXUTILS) $(DXUTILOBJS) $(SDLUTILS) $(SDLUTILOBJS) $(UTILADDOBJS)
enumdisplay$(EXESUFFIX) getdxdidf$(EXESUFFIX) makesdlkeytrans$(EXESUFFIX) \
$(OBJ)/compat.$o $(OBJ)/getdxdidf.$o $(OBJ)/makesdlkeytrans.$o
printutils: printutils:
echo "$(UTILS)" echo "$(UTILS)"
printdxutils:
echo "$(DXUTILS)"
printsdlutils:
echo "$(SDLUTILS)"
veryclean: clean cleanutils veryclean: clean cleanutils
-rm -f $(ENGINELIB) $(EDITORLIB) -rm -f $(ENGINELIB) $(EDITORLIB)

8
polymer/eduke32/build/src/util/wad2map.c
View file

@ -300,7 +300,7 @@ void parsescript(void)
int spritenumstat, slen; int spritenumstat, slen;
char ch; char ch;
clearbufbyte(&sectspri[0], sizeof(short) * MAXSECTS * 8, 0xffffffff); Bmemset(sectspri, 0xffffffff, MAXSECTS*8*sizeof(short));
if (scriptname[0] == 0) if (scriptname[0] == 0)
{ {
@ -1050,9 +1050,9 @@ int main(int argc, char **argv)
} }
} }
clearbufbyte(&sector[0], sizeof(sectortype) * MAXSECTORS, 0); Bmemset(sector, 0, MAXSECTORS*sizeof(sectortype));
clearbufbyte(&wall[0], sizeof(walltype) * MAXWALLS, 0); Bmemset(wall, 0, MAXWALLS*sizeof(walltype));
clearbufbyte(&sprite[0], sizeof(spritetype) * MAXSPRITES, 0); Bmemset(sprite, 0, MAXSPRITES*sizeof(spritetype));
for(i=0;i<MAXSECTORS;i++) sector[i].extra = -1; for(i=0;i<MAXSECTORS;i++) sector[i].extra = -1;
for(i=0;i<MAXWALLS;i++) wall[i].extra = -1; for(i=0;i<MAXWALLS;i++) wall[i].extra = -1;
for(i=0;i<MAXSPRITES;i++) sprite[i].extra = -1; for(i=0;i<MAXSPRITES;i++) sprite[i].extra = -1;