From 5119b135d1c5d05871c73cdffafbc45319433ec4 Mon Sep 17 00:00:00 2001 From: helixhorned Date: Sun, 4 Mar 2012 20:12:15 +0000 Subject: [PATCH] More utils tweaks. - remove the objects too on 'clean' - fix warning with 'transpal' on x64 (generates translucency and shade tables) git-svn-id: https://svn.eduke32.com/eduke32@2404 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/build/Makefile | 6 ++++-- polymer/eduke32/build/src/util/transpal.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/polymer/eduke32/build/Makefile b/polymer/eduke32/build/Makefile index 7d3d2ff26..d89173ab0 100644 --- a/polymer/eduke32/build/Makefile +++ b/polymer/eduke32/build/Makefile @@ -167,7 +167,9 @@ OURCFLAGS+= $(BUILDCFLAGS) # TARGETS -UTILS=kextract$(EXESUFFIX) kgroup$(EXESUFFIX) transpal$(EXESUFFIX) wad2art$(EXESUFFIX) wad2map$(EXESUFFIX) md2tool$(EXESUFFIX) +UTILOBJS=$(OBJ)/kextract.$o $(OBJ)/kgroup.$o $(OBJ)/transpal.$o $(OBJ)/wad2art.$o $(OBJ)/wad2map.$o $(OBJ)/md2tool.$o \ + $(OBJ)/compat.$o $(OBJ)/pragmas.$o +UTILS=kextract kgroup transpal wad2art wad2map md2tool # all: $(OBJ)/$(ENGINELIB) $(OBJ)/$(EDITORLIB) utils: $(UTILS) @@ -268,7 +270,7 @@ clean: -rm -f $(OBJ)/* cleanutils: - -rm -f $(UTILS) + -rm -f $(UTILS) $(UTILOBJS) veryclean: clean cleanutils -rm -f $(ENGINELIB) $(EDITORLIB) diff --git a/polymer/eduke32/build/src/util/transpal.c b/polymer/eduke32/build/src/util/transpal.c index 1f3456365..0be0a856a 100644 --- a/polymer/eduke32/build/src/util/transpal.c +++ b/polymer/eduke32/build/src/util/transpal.c @@ -125,8 +125,8 @@ void initfastcolorlookup(int rscale, int gscale, int bscale) j += 129-(i<<1); } - clearbufbyte(FP_OFF(colhere),sizeof(colhere),0L); - clearbufbyte(FP_OFF(colhead),sizeof(colhead),0L); + Bmemset(colhere, 0, sizeof(colhere)); + Bmemset(colhead, 0, sizeof(colhead)); ptr = (char *)&palette[768-3]; for(i=255;i>=0;i--,ptr-=3)