moved bitmap scroller stuff to dedicated directory

This commit is contained in:
Christian Kroll 2012-09-15 23:18:43 +00:00
parent e1eda5b888
commit 5a7834bf8f
19 changed files with 59 additions and 52 deletions

View File

@ -40,6 +40,7 @@ include defaults.mk
@ echo "checking in which subdirs to build" @ echo "checking in which subdirs to build"
@ $(RM) -f $@ @ $(RM) -f $@
@ echo "SUBDIRS += animations" >> $@ @ echo "SUBDIRS += animations" >> $@
@ echo "SUBDIRS += animations/bitmapscroller" >> $@
@ echo "SUBDIRS += smallani" >> $@ @ echo "SUBDIRS += smallani" >> $@
@ (for subdir in `grep -e "^#define .*_SUPPORT" autoconf.h \ @ (for subdir in `grep -e "^#define .*_SUPPORT" autoconf.h \
| sed -e "s/^#define //" -e "s/_SUPPORT.*//" \ | sed -e "s/^#define //" -e "s/_SUPPORT.*//" \

View File

@ -37,30 +37,6 @@ ifeq ($(ANIMATION_LTN_ANT),y)
SRC += ltn_ant.c SRC += ltn_ant.c
endif 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))) ifneq (,$(filter y,$(ANIMATION_PLASMA) $(ANIMATION_PSYCHEDELIC)))
SRC += fpmath_patterns.c SRC += fpmath_patterns.c
endif endif

View File

@ -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

View File

@ -1,7 +1,7 @@
#include <stdint.h> #include <stdint.h>
#include <assert.h> #include <assert.h>
#include "../compat/pgmspace.h" #include "../../compat/pgmspace.h"
#include "bitmapscroller.h" #include "bitmapscroller.h"
#include "amphibian.h" #include "amphibian.h"

View File

@ -13,10 +13,10 @@
#include <stdint.h> #include <stdint.h>
#include <assert.h> #include <assert.h>
#include "../random/prng.h" #include "../../random/prng.h"
#include "../util.h" #include "../../util.h"
#include "../autoconf.h" #include "../../autoconf.h"
#include "../pixel.h" #include "../../pixel.h"
#include "bitmapscroller.h" #include "bitmapscroller.h"

View File

@ -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

View File

@ -1,7 +1,7 @@
#include <stdint.h> #include <stdint.h>
#include <assert.h> #include <assert.h>
#include "../compat/pgmspace.h" #include "../../compat/pgmspace.h"
#include "bitmapscroller.h" #include "bitmapscroller.h"
#include "fairydust.h" #include "fairydust.h"

View File

@ -0,0 +1,6 @@
#ifndef LOGO_FAIRYDUST_H_
#define LOGO_FAIRYDUST_H_
void fairydust();
#endif /* LOGO_28C3_H_ */

View File

@ -1,7 +1,7 @@
#include <stdint.h> #include <stdint.h>
#include <assert.h> #include <assert.h>
#include "../compat/pgmspace.h" #include "../../compat/pgmspace.h"
#include "bitmapscroller.h" #include "bitmapscroller.h"
#include "ideenpark.h" #include "ideenpark.h"

View File

@ -1,7 +1,7 @@
#include <stdint.h> #include <stdint.h>
#include <assert.h> #include <assert.h>
#include "../compat/pgmspace.h" #include "../../compat/pgmspace.h"
#include "bitmapscroller.h" #include "bitmapscroller.h"
#include "laborlogo.h" #include "laborlogo.h"

View File

@ -1,7 +1,7 @@
#include <stdint.h> #include <stdint.h>
#include <assert.h> #include <assert.h>
#include "../compat/pgmspace.h" #include "../../compat/pgmspace.h"
#include "bitmapscroller.h" #include "bitmapscroller.h"
#include "outofspec.h" #include "outofspec.h"

View File

@ -49,14 +49,8 @@ comment "Animations"
int "Request Timeout (ms)" TIME_UPDATE_TIMEOUT 50 int "Request Timeout (ms)" TIME_UPDATE_TIMEOUT 50
endmenu endmenu
dep_bool_menu "Bitmap Scroller" ANIMATION_BMSCROLLER y $RANDOM_SUPPORT source animations/bitmapscroller/config.in
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
mainmenu_option next_comment mainmenu_option next_comment
comment "Fixed-point math patterns" comment "Fixed-point math patterns"
bool "Plasma" ANIMATION_PLASMA $ANIMATION_FIXEDPOINT bool "Plasma" ANIMATION_PLASMA $ANIMATION_FIXEDPOINT

View File

@ -1,6 +0,0 @@
#ifndef LOGO_28C3_H_
#define LOGO_28C3_H_
void fairydust();
#endif /* LOGO_28C3_H_ */

View File

@ -12,11 +12,11 @@
#include "animations/flyingdots.h" #include "animations/flyingdots.h"
#include "animations/breakout_demo.h" #include "animations/breakout_demo.h"
#include "animations/ltn_ant.h" #include "animations/ltn_ant.h"
#include "animations/amphibian.h" #include "animations/bitmapscroller/laborlogo.h"
#include "animations/laborlogo.h" #include "animations/bitmapscroller/amphibian.h"
#include "animations/outofspec.h" #include "animations/bitmapscroller/outofspec.h"
#include "animations/fairydust.h" #include "animations/bitmapscroller/fairydust.h"
#include "animations/ideenpark.h" #include "animations/bitmapscroller/ideenpark.h"
#include "animations/fpmath_patterns.h" #include "animations/fpmath_patterns.h"
#include "animations/mherweg.h" #include "animations/mherweg.h"
#include "animations/blackhole.h" #include "animations/blackhole.h"