X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=android%2FMakefile;h=7549411bcb96ac8a9c0ea709e1ef5cd430ccfeba;hb=4361b69d3178d7fc98d0388f9a223af6c2651aba;hp=f296352011d29d9f3263e8a2ef0ad8e83de90659;hpb=aa75c7476aeaa84cf3abc192b376a8b03c325213;p=xscreensaver

diff --git a/android/Makefile b/android/Makefile
index f2963520..7549411b 100644
--- a/android/Makefile
+++ b/android/Makefile
@@ -59,7 +59,9 @@ export ANDROID_HACKS=		\
 	compass			\
 	coral			\
 	crystal			\
+	cubestack		\
 	cubestorm		\
+	cubetwist		\
 	cwaves			\
 	cynosure		\
 	dangerball		\
@@ -67,6 +69,7 @@ export ANDROID_HACKS=		\
 	deco			\
 	demon			\
 	discrete		\
+	discoball		\
 	distort			\
 	dnalogo			\
 	drift			\
@@ -94,10 +97,12 @@ export ANDROID_HACKS=		\
 	glschool		\
 	glsnake			\
 	gltext			\
+	goop			\
 	grav			\
 	greynetic		\
 	helix			\
 	hexadrop		\
+	hexstrut		\
 	hilbert			\
 	hopalong		\
 	hypnowheel		\
@@ -137,6 +142,7 @@ export ANDROID_HACKS=		\
 	raverhoop		\
 	rd-bomb			\
 	ripples			\
+	rocks			\
 	romanboy		\
 	rorschach		\
 	rotzoomer		\
@@ -147,6 +153,7 @@ export ANDROID_HACKS=		\
 	sierpinski		\
 	sierpinski3d		\
 	slidescreen		\
+	splodesic		\
 	squiral			\
 	stairs			\
 	starfish		\
@@ -164,6 +171,7 @@ export ANDROID_HACKS=		\
 	twang			\
 	unknownpleasures	\
 	vermiculate		\
+	vigilance		\
 	voronoi			\
 	wander			\
 	whirlwindwarp		\
@@ -206,7 +214,6 @@ ANDROID_TODO=			\
 	glhanoi			\
 	glplanet		\
 	glslideshow		\
-	goop			\
 	halftone		\
 	halo			\
 	hypertorus		\
@@ -230,7 +237,6 @@ ANDROID_TODO=			\
 	pulsar			\
 	qix			\
 	queens			\
-	rocks			\
 	skytentacles		\
 	slip			\
 	speedmine		\
@@ -269,6 +275,15 @@ CVT  = -thumbnail '150x150^' -gravity center -extent 150x150 \
     -quality 95 \
     +dither -colors 128
 
+# If we are making the m6502 hack, create the header file for Android
+m6502.h::
+	@for h in $(ANDROID_HACKS) ; do \
+		if [ $${h} = "m6502" ] ; then \
+			echo "Making $${h} header ..."; \
+			../hacks/m6502.sh ../hacks/m6502.h ../hacks/images/m6502/*.asm ; \
+			echo "Made $${h} header"; \
+		fi; \
+	done
 
 project/xscreensaver/res/drawable/%.png:
 	@\
@@ -296,7 +311,8 @@ clean_thumbs::
 	for f in $(ANDROID_HACKS) $(ANDROID_TODO) ; do			\
 	  rm -f project/xscreensaver/res/drawable/$$f.png ;		\
 	done
-distclean:: clean_thumbs
+
+distclean:: clean_thumbs clean
 
 
 EXTRA_TARFILES = project/xscreensaver/res/drawable/thumbnail.png \
@@ -308,6 +324,7 @@ echo_tarfiles:
 		-o -name '*.keystore'		\
 		-o -name '*_dream.xml'		\
 		-o -name '*_settings.xml'	\
+		-o -name '*_wallpaper.xml'	\
 		-o -name AndroidManifest.xml	\
 		-o -name strings.xml		\
 		-o -name settings.xml		\
@@ -326,9 +343,12 @@ echo_tarfiles:
 		| sort` ;			\
 	echo $$FILES
 
-debug::
+run_check::
+	../hacks/check-configs.pl --build-android $(ANDROID_HACKS)
+
+debug:: m6502.h run_check
 	$(GRADLE) assembleDebug
-release::
+release:: m6502.h run_check
 	export APP_ABI=all ; \
 	$(GRADLE) assembleRelease
 
@@ -380,3 +400,8 @@ apk:: release
 #  dnalogo			\
 #  twang			\
 #  memscroller			\
+#  phosphor			\
+#  discoball			\
+#  cubetwist			\
+#  cubestack			\
+#  splodesic			\