From 5a7834bf8fe5f77156a737018015f0eb3b56f107 Mon Sep 17 00:00:00 2001 From: Christian Kroll Date: Sat, 15 Sep 2012 23:18:43 +0000 Subject: [PATCH] moved bitmap scroller stuff to dedicated directory --- Makefile | 1 + animations/Makefile | 24 --------------- animations/bitmapscroller/Makefile | 29 +++++++++++++++++++ animations/{ => bitmapscroller}/amphibian.c | 2 +- animations/{ => bitmapscroller}/amphibian.h | 0 .../{ => bitmapscroller}/bitmapscroller.c | 8 ++--- .../{ => bitmapscroller}/bitmapscroller.h | 0 animations/bitmapscroller/config.in | 7 +++++ animations/{ => bitmapscroller}/fairydust.c | 2 +- animations/bitmapscroller/fairydust.h | 6 ++++ animations/{ => bitmapscroller}/ideenpark.c | 2 +- animations/{ => bitmapscroller}/ideenpark.h | 0 animations/{ => bitmapscroller}/laborlogo.c | 2 +- animations/{ => bitmapscroller}/laborlogo.h | 0 animations/{ => bitmapscroller}/outofspec.c | 2 +- animations/{ => bitmapscroller}/outofspec.h | 0 animations/config.in | 10 ++----- animations/fairydust.h | 6 ---- display_loop.c | 10 +++---- 19 files changed, 59 insertions(+), 52 deletions(-) create mode 100644 animations/bitmapscroller/Makefile rename animations/{ => bitmapscroller}/amphibian.c (99%) rename animations/{ => bitmapscroller}/amphibian.h (100%) rename animations/{ => bitmapscroller}/bitmapscroller.c (98%) rename animations/{ => bitmapscroller}/bitmapscroller.h (100%) create mode 100644 animations/bitmapscroller/config.in rename animations/{ => bitmapscroller}/fairydust.c (99%) create mode 100644 animations/bitmapscroller/fairydust.h rename animations/{ => bitmapscroller}/ideenpark.c (99%) rename animations/{ => bitmapscroller}/ideenpark.h (100%) rename animations/{ => bitmapscroller}/laborlogo.c (98%) rename animations/{ => bitmapscroller}/laborlogo.h (100%) rename animations/{ => bitmapscroller}/outofspec.c (99%) rename animations/{ => bitmapscroller}/outofspec.h (100%) delete mode 100644 animations/fairydust.h diff --git a/Makefile b/Makefile index cb4c378..b3b5404 100644 --- a/Makefile +++ b/Makefile @@ -40,6 +40,7 @@ include defaults.mk @ echo "checking in which subdirs to build" @ $(RM) -f $@ @ echo "SUBDIRS += animations" >> $@ + @ echo "SUBDIRS += animations/bitmapscroller" >> $@ @ echo "SUBDIRS += smallani" >> $@ @ (for subdir in `grep -e "^#define .*_SUPPORT" autoconf.h \ | sed -e "s/^#define //" -e "s/_SUPPORT.*//" \ diff --git a/animations/Makefile b/animations/Makefile index c775a28..248f9c8 100644 --- a/animations/Makefile +++ b/animations/Makefile @@ -37,30 +37,6 @@ ifeq ($(ANIMATION_LTN_ANT),y) SRC += ltn_ant.c endif -ifeq ($(ANIMATION_BMSCROLLER),y) - SRC += bitmapscroller.c -endif - -ifeq ($(ANIMATION_LABORLOGO),y) - SRC += laborlogo.c -endif - -ifeq ($(ANIMATION_AMPHIBIAN),y) - SRC += amphibian.c -endif - -ifeq ($(ANIMATION_LOGO_OOS),y) - SRC += outofspec.c -endif - -ifeq ($(ANIMATION_FAIRYDUST),y) - SRC += fairydust.c -endif - -ifeq ($(ANIMATION_IDEENPARK),y) - SRC += ideenpark.c -endif - ifneq (,$(filter y,$(ANIMATION_PLASMA) $(ANIMATION_PSYCHEDELIC))) SRC += fpmath_patterns.c endif diff --git a/animations/bitmapscroller/Makefile b/animations/bitmapscroller/Makefile new file mode 100644 index 0000000..34a9759 --- /dev/null +++ b/animations/bitmapscroller/Makefile @@ -0,0 +1,29 @@ +TOPDIR = ../.. + +include $(TOPDIR)/defaults.mk + +ifeq ($(ANIMATION_BMSCROLLER),y) + SRC = bitmapscroller.c +endif + +ifeq ($(ANIMATION_LABORLOGO),y) + SRC += laborlogo.c +endif + +ifeq ($(ANIMATION_AMPHIBIAN),y) + SRC += amphibian.c +endif + +ifeq ($(ANIMATION_LOGO_OOS),y) + SRC += outofspec.c +endif + +ifeq ($(ANIMATION_FAIRYDUST),y) + SRC += fairydust.c +endif + +ifeq ($(ANIMATION_IDEENPARK),y) + SRC += ideenpark.c +endif + +include $(TOPDIR)/rules.mk diff --git a/animations/amphibian.c b/animations/bitmapscroller/amphibian.c similarity index 99% rename from animations/amphibian.c rename to animations/bitmapscroller/amphibian.c index 74f65f7..ffc4cff 100644 --- a/animations/amphibian.c +++ b/animations/bitmapscroller/amphibian.c @@ -1,7 +1,7 @@ #include #include -#include "../compat/pgmspace.h" +#include "../../compat/pgmspace.h" #include "bitmapscroller.h" #include "amphibian.h" diff --git a/animations/amphibian.h b/animations/bitmapscroller/amphibian.h similarity index 100% rename from animations/amphibian.h rename to animations/bitmapscroller/amphibian.h diff --git a/animations/bitmapscroller.c b/animations/bitmapscroller/bitmapscroller.c similarity index 98% rename from animations/bitmapscroller.c rename to animations/bitmapscroller/bitmapscroller.c index 30f0db8..27afc04 100644 --- a/animations/bitmapscroller.c +++ b/animations/bitmapscroller/bitmapscroller.c @@ -13,10 +13,10 @@ #include #include -#include "../random/prng.h" -#include "../util.h" -#include "../autoconf.h" -#include "../pixel.h" +#include "../../random/prng.h" +#include "../../util.h" +#include "../../autoconf.h" +#include "../../pixel.h" #include "bitmapscroller.h" diff --git a/animations/bitmapscroller.h b/animations/bitmapscroller/bitmapscroller.h similarity index 100% rename from animations/bitmapscroller.h rename to animations/bitmapscroller/bitmapscroller.h diff --git a/animations/bitmapscroller/config.in b/animations/bitmapscroller/config.in new file mode 100644 index 0000000..fab0b36 --- /dev/null +++ b/animations/bitmapscroller/config.in @@ -0,0 +1,7 @@ +dep_bool_menu "Bitmap Scroller" ANIMATION_BMSCROLLER y $RANDOM_SUPPORT + dep_bool "LABOR Logo" ANIMATION_LABORLOGO $ANIMATION_BMSCROLLER + dep_bool "Amphibian" ANIMATION_AMPHIBIAN $ANIMATION_BMSCROLLER + dep_bool "Out of Spec Logo" ANIMATION_LOGO_OOS $ANIMATION_BMSCROLLER + dep_bool "Fairydust" ANIMATION_FAIRYDUST $ANIMATION_BMSCROLLER + dep_bool "Ideenpark" ANIMATION_IDEENPARK $ANIMATION_BMSCROLLER +endmenu \ No newline at end of file diff --git a/animations/fairydust.c b/animations/bitmapscroller/fairydust.c similarity index 99% rename from animations/fairydust.c rename to animations/bitmapscroller/fairydust.c index 85487a0..f951e4f 100644 --- a/animations/fairydust.c +++ b/animations/bitmapscroller/fairydust.c @@ -1,7 +1,7 @@ #include #include -#include "../compat/pgmspace.h" +#include "../../compat/pgmspace.h" #include "bitmapscroller.h" #include "fairydust.h" diff --git a/animations/bitmapscroller/fairydust.h b/animations/bitmapscroller/fairydust.h new file mode 100644 index 0000000..15a3525 --- /dev/null +++ b/animations/bitmapscroller/fairydust.h @@ -0,0 +1,6 @@ +#ifndef LOGO_FAIRYDUST_H_ +#define LOGO_FAIRYDUST_H_ + +void fairydust(); + +#endif /* LOGO_28C3_H_ */ diff --git a/animations/ideenpark.c b/animations/bitmapscroller/ideenpark.c similarity index 99% rename from animations/ideenpark.c rename to animations/bitmapscroller/ideenpark.c index 6345dbc..6e072e0 100644 --- a/animations/ideenpark.c +++ b/animations/bitmapscroller/ideenpark.c @@ -1,7 +1,7 @@ #include #include -#include "../compat/pgmspace.h" +#include "../../compat/pgmspace.h" #include "bitmapscroller.h" #include "ideenpark.h" diff --git a/animations/ideenpark.h b/animations/bitmapscroller/ideenpark.h similarity index 100% rename from animations/ideenpark.h rename to animations/bitmapscroller/ideenpark.h diff --git a/animations/laborlogo.c b/animations/bitmapscroller/laborlogo.c similarity index 98% rename from animations/laborlogo.c rename to animations/bitmapscroller/laborlogo.c index 448c43e..67b0c3d 100644 --- a/animations/laborlogo.c +++ b/animations/bitmapscroller/laborlogo.c @@ -1,7 +1,7 @@ #include #include -#include "../compat/pgmspace.h" +#include "../../compat/pgmspace.h" #include "bitmapscroller.h" #include "laborlogo.h" diff --git a/animations/laborlogo.h b/animations/bitmapscroller/laborlogo.h similarity index 100% rename from animations/laborlogo.h rename to animations/bitmapscroller/laborlogo.h diff --git a/animations/outofspec.c b/animations/bitmapscroller/outofspec.c similarity index 99% rename from animations/outofspec.c rename to animations/bitmapscroller/outofspec.c index ea58a3d..cc22bfc 100644 --- a/animations/outofspec.c +++ b/animations/bitmapscroller/outofspec.c @@ -1,7 +1,7 @@ #include #include -#include "../compat/pgmspace.h" +#include "../../compat/pgmspace.h" #include "bitmapscroller.h" #include "outofspec.h" diff --git a/animations/outofspec.h b/animations/bitmapscroller/outofspec.h similarity index 100% rename from animations/outofspec.h rename to animations/bitmapscroller/outofspec.h diff --git a/animations/config.in b/animations/config.in index 9e4d44e..fe99f3a 100644 --- a/animations/config.in +++ b/animations/config.in @@ -49,14 +49,8 @@ comment "Animations" int "Request Timeout (ms)" TIME_UPDATE_TIMEOUT 50 endmenu - dep_bool_menu "Bitmap Scroller" ANIMATION_BMSCROLLER y $RANDOM_SUPPORT - dep_bool "LABOR Logo" ANIMATION_LABORLOGO $ANIMATION_BMSCROLLER - dep_bool "Amphibian" ANIMATION_AMPHIBIAN $ANIMATION_BMSCROLLER - dep_bool "Out of Spec Logo" ANIMATION_LOGO_OOS $ANIMATION_BMSCROLLER - dep_bool "Fairydust" ANIMATION_FAIRYDUST $ANIMATION_BMSCROLLER - dep_bool "Ideenpark" ANIMATION_IDEENPARK $ANIMATION_BMSCROLLER - endmenu - + source animations/bitmapscroller/config.in + mainmenu_option next_comment comment "Fixed-point math patterns" bool "Plasma" ANIMATION_PLASMA $ANIMATION_FIXEDPOINT diff --git a/animations/fairydust.h b/animations/fairydust.h deleted file mode 100644 index 708e8f3..0000000 --- a/animations/fairydust.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef LOGO_28C3_H_ -#define LOGO_28C3_H_ - -void fairydust(); - -#endif /* LOGO_28C3_H_ */ diff --git a/display_loop.c b/display_loop.c index db3e36f..132dd03 100644 --- a/display_loop.c +++ b/display_loop.c @@ -12,11 +12,11 @@ #include "animations/flyingdots.h" #include "animations/breakout_demo.h" #include "animations/ltn_ant.h" -#include "animations/amphibian.h" -#include "animations/laborlogo.h" -#include "animations/outofspec.h" -#include "animations/fairydust.h" -#include "animations/ideenpark.h" +#include "animations/bitmapscroller/laborlogo.h" +#include "animations/bitmapscroller/amphibian.h" +#include "animations/bitmapscroller/outofspec.h" +#include "animations/bitmapscroller/fairydust.h" +#include "animations/bitmapscroller/ideenpark.h" #include "animations/fpmath_patterns.h" #include "animations/mherweg.h" #include "animations/blackhole.h"