From d56868e820ccfa384d574760a79ad5c5286e6fe1 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Wed, 2 Jul 2014 18:01:33 -0700 Subject: [PATCH] Fiddle with the dependency info for libresrc to hopefully work better --- src/libresrc/Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/libresrc/Makefile b/src/libresrc/Makefile index c4ea68a48..644185673 100644 --- a/src/libresrc/Makefile +++ b/src/libresrc/Makefile @@ -8,18 +8,21 @@ resrc_OBJ := \ $(d)default_config.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 -$(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 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 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 endif