Fiddle with the dependency info for libresrc to hopefully work better

This commit is contained in:
Thomas Goyne 2014-07-02 18:01:33 -07:00
parent 3832f700c5
commit d56868e820

View file

@ -8,18 +8,21 @@ resrc_OBJ := \
$(d)default_config.o \ $(d)default_config.o \
$(d)libresrc.o $(d)libresrc.o
$(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp
RESPACK := cd $(TOP)src/libresrc; $(TOP)vendor/luajit/src/host/minilua $(TOP)tools/respack.lua RESPACK := cd $(TOP)src/libresrc; $(TOP)vendor/luajit/src/host/minilua $(TOP)tools/respack.lua
$(d)bitmap.cpp $(d)bitmap.h: $(TOP)tools/respack.lua $(d)../bitmaps/button $(d)bitmap.cpp: $(d)bitmap.h
$(d)default_config.cpp: $(d)default_config.h
$(d)bitmap.h: $(TOP)tools/respack.lua $(d)../bitmaps/button
$(RESPACK) ../bitmaps/manifest.respack bitmap.cpp bitmap.h $(RESPACK) ../bitmaps/manifest.respack bitmap.cpp bitmap.h
ifeq (yes, $(BUILD_DARWIN)) ifeq (yes, $(BUILD_DARWIN))
$(d)default_config.cpp $(d)default_config.h: $(TOP)tools/respack.lua $(d)*.json $(d)osx/*.json $(d)default_config.h: $(TOP)tools/respack.lua $(d)*.json $(d)osx/*.json
$(RESPACK) manifest_osx.respack default_config.cpp default_config.h $(RESPACK) manifest_osx.respack default_config.cpp default_config.h
else else
$(d)default_config.cpp $(d)default_config.h: $(TOP)tools/respack.lua $(d)*.json $(d)default_config.h: $(TOP)tools/respack.lua $(d)*.json
$(RESPACK) manifest.respack default_config.cpp default_config.h $(RESPACK) manifest.respack default_config.cpp default_config.h
endif endif