Everywhere: Merge V_1_1_29_40_POST_ACCEPTANCE

This commit is contained in:
Jan Lindemann 2011-02-20 14:15:22 +00:00 committed by Jan Lindemann
commit 2939f8e3a8
29 changed files with 743 additions and 125 deletions

View file

@ -1,6 +1,6 @@
LOCAL_CPP += main.cpp
YAPP_CLASS ?= $(firstword $(basename $(wildcard YApp*.h Y*.h *.h)))
YAPP_CLASS_H = $(firstword $(wildcard $(addsuffix /$(YAPP_CLASS).h,\
YAPP_CLASS_H ?= $(firstword $(wildcard $(addsuffix /$(YAPP_CLASS).h,\
$(subst -I,,$(INCLUDE)))) $(YAPP_CLASS).h)
LOCAL_CFLAGS += -DVERSION_STR=\"$(VERSION)\"
LOCAL_CPPFLAGS += -DVERSION_STR=\"$(VERSION)\"
@ -20,5 +20,5 @@ clean.yapp:
rm -f main.cpp
main.cpp: $(YAPP_CLASS_H)
echo -e "#include <YAppRunner.h>\n#include \"$<\"\nyapp_main($(YAPP_CLASS))" > $@
echo -e "#include \"$<\"\n#include <YAppRunner.h>\nyapp_main($(YAPP_CLASS))" > $@