X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=android%2FMakefile;h=f0d5da0185bbcdeafdac47eb01c97e113dd0eefd;hb=c85f503f5793839a6be4c818332aca4a96927bb2;hp=35c24ec2050cdc060dd553f01a7a4ecf0c4e1b86;hpb=d6b0217f2417bd19187f0ebc389d6c5c2233b11c;p=xscreensaver

diff --git a/android/Makefile b/android/Makefile
index 35c24ec2..f0d5da01 100644
--- a/android/Makefile
+++ b/android/Makefile
@@ -1,7 +1,7 @@
 # XScreenSaver for Android
 
 export TERM=dumb
-GRADLE = cd project ; ./gradlew
+GRADLE = ./gradlew
 
 default:: debug
 all:: release
@@ -40,49 +40,70 @@ export ANDROID_HACKS=		\
 	abstractile		\
 	anemone			\
 	anemotaxis		\
+	antmaze			\
+	antspotlight		\
 	apollonian		\
+	atlantis		\
 	attraction		\
 	atunnel			\
+	binaryring		\
 	blaster			\
 	blinkbox		\
+	blitspin		\
 	blocktube		\
 	boing			\
+	bouboule		\
 	bouncingcow		\
 	boxed			\
 	boxfit			\
 	braid			\
 	bsod			\
+	bumps			\
 	cage			\
 	ccurve			\
+	celtic			\
+	circuit			\
+	cityflow		\
 	cloudlife		\
 	companioncube		\
 	compass			\
 	coral			\
+	crackberg		\
+	crumbler		\
 	crystal			\
+	cube21			\
+	cubenetic		\
 	cubestack		\
 	cubestorm		\
 	cubetwist		\
+	cubicgrid		\
 	cwaves			\
 	cynosure		\
 	dangerball		\
 	decayscreen		\
 	deco			\
+	deluxe			\
 	demon			\
-	discrete		\
 	discoball		\
+	discrete		\
 	distort			\
 	dnalogo			\
 	drift			\
+	dymaxionmap		\
+	endgame			\
 	energystream		\
 	engine			\
 	epicycle		\
 	eruption		\
+	esper			\
 	euler2d			\
 	fadeplot		\
 	fiberlamp		\
+	filmleader		\
 	fireworkx		\
 	flame			\
 	flipflop		\
+	flipscreen3d		\
 	flow			\
 	fluidballs		\
 	flyingtoasters		\
@@ -91,24 +112,36 @@ export ANDROID_HACKS=		\
 	gears			\
 	geodesic		\
 	geodesicgears		\
+	gflux			\
+	glblur			\
 	glcells			\
+	gleidescope		\
+	glhanoi			\
 	glknots			\
 	glmatrix		\
+	glplanet		\
 	glschool		\
+	glslideshow		\
 	glsnake			\
 	gltext			\
+	goop			\
 	grav			\
 	greynetic		\
+	halo			\
 	helix			\
 	hexadrop		\
 	hexstrut		\
 	hilbert			\
 	hopalong		\
+	hypertorus		\
 	hypnowheel		\
 	ifs			\
 	imsmap			\
+	interaggregate		\
 	interference		\
 	intermomentary		\
+	jigglypuff		\
+	jigsaw			\
 	julia			\
 	kaleidescope		\
 	kaleidocycle		\
@@ -119,28 +152,42 @@ export ANDROID_HACKS=		\
 	loop			\
 	m6502			\
 	maze			\
+	maze3d			\
 	memscroller		\
 	menger			\
 	metaballs		\
+	mirrorblob		\
+	moebius			\
 	moebiusgears		\
 	moire			\
+	moire2			\
 	morph3d			\
+	mountain		\
+	munch			\
 	nerverot		\
 	noof			\
+	noseguy			\
+	peepers			\
 	penetrate		\
 	penrose			\
 	petri			\
 	piecewise		\
 	pinion			\
+	pipes			\
 	polytopes		\
 	pong			\
 	popsquares		\
+	projectiveplane		\
 	providence		\
+	pulsar			\
 	pyro			\
 	quasicrystal		\
+	queens			\
 	raverhoop		\
+	razzledazzle		\
 	rd-bomb			\
 	ripples			\
+	rocks			\
 	romanboy		\
 	rorschach		\
 	rotzoomer		\
@@ -150,109 +197,70 @@ export ANDROID_HACKS=		\
 	shadebobs		\
 	sierpinski		\
 	sierpinski3d		\
+	skytentacles		\
 	slidescreen		\
+	slip			\
+	spheremonics		\
+	splitflap		\
 	splodesic		\
+	spotlight		\
 	squiral			\
 	stairs			\
-	starfish		\
 	stonerview		\
 	strange			\
 	substrate		\
 	superquadrics		\
+	surfaces		\
 	swirl			\
 	tangram			\
+	tessellimage		\
 	thornbird		\
 	timetunnel		\
 	topblock		\
 	triangle		\
 	tronbit			\
+	truchet			\
 	twang			\
 	unknownpleasures	\
 	vermiculate		\
+	vfeedback		\
+	vigilance		\
 	voronoi			\
 	wander			\
 	whirlwindwarp		\
 	winduprobot		\
 	wormhole		\
+	xanalogtv		\
 	xflame			\
+	xjack			\
 	xlyap			\
+	xmatrix			\
+	xrayswarm		\
 	xspirograph		\
+	zoom			\
 
 
 # These don't work well enough to turn on by default:
 #
 ANDROID_TODO=			\
 	antinspect		\
-	antmaze			\
-	antspotlight		\
-	atlantis		\
 	barcode			\
-	binaryring		\
-	blitspin		\
-	bouboule		\
-	bumps			\
 	carousel		\
-	celtic			\
-	circuit			\
-	cityflow		\
-	crackberg		\
-	cube21			\
-	cubenetic		\
-	cubicgrid		\
-	deluxe			\
-	dymaxionmap		\
-	endgame			\
-	flipscreen3d		\
 	fliptext		\
 	fontglide		\
-	gflux			\
-	glblur			\
-	gleidescope		\
-	glhanoi			\
-	glplanet		\
-	glslideshow		\
-	goop			\
 	halftone		\
-	halo			\
-	hypertorus		\
-	interaggregate		\
-	jigglypuff		\
-	jigsaw			\
 	juggler3d		\
-	mirrorblob		\
-	moebius			\
-	moire2			\
 	molecule		\
-	mountain		\
-	munch			\
-	noseguy			\
 	pedal			\
 	phosphor		\
 	photopile		\
-	pipes			\
 	polyominoes		\
-	projectiveplane		\
-	pulsar			\
 	qix			\
-	queens			\
-	rocks			\
-	skytentacles		\
-	slip			\
 	speedmine		\
-	spheremonics		\
-	splitflap		\
-	spotlight		\
+	starfish		\
 	starwars		\
-	surfaces		\
-	tessellimage		\
 	testx11			\
-	truchet			\
 	unicrud			\
-	xanalogtv		\
-	xjack			\
-	xmatrix			\
-	xrayswarm		\
-	zoom			\
 
 
 # Download and resize images from jwz.org.
@@ -284,7 +292,7 @@ m6502.h::
 		fi; \
 	done
 
-project/xscreensaver/res/drawable/%.png:
+xscreensaver/res/drawable/%.png:
 	@\
 	FILE1=`echo "$@" | sed 's!^.*/\([^/]*\)\.png$$!\1.jpg!'` ;	\
 	FILE2="$@" ;							\
@@ -302,27 +310,29 @@ project/xscreensaver/res/drawable/%.png:
 
 thumbs::
 	@for f in $(ANDROID_HACKS) $(ANDROID_TODO) ; do			\
-	  $(MAKE) project/xscreensaver/res/drawable/$$f.png ;		\
+	  $(MAKE) xscreensaver/res/drawable/$$f.png ;			\
 	done
 
 clean_thumbs::
 	@\
 	for f in $(ANDROID_HACKS) $(ANDROID_TODO) ; do			\
-	  rm -f project/xscreensaver/res/drawable/$$f.png ;		\
+	  rm -f xscreensaver/res/drawable/$$f.png ;			\
 	done
 
 distclean:: clean_thumbs clean
 
 
-EXTRA_TARFILES = project/xscreensaver/res/drawable/thumbnail.png \
+EXTRA_TARFILES = xscreensaver/res/drawable/thumbnail.png \
 
 echo_tarfiles:
 	@FILES=`find . $(EXTRA_TARFILES) \( \(	\
 		   -name .DS_Store		\
 		-o -name '*~'			\
+		-o -name '*.jks'		\
 		-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		\
@@ -341,27 +351,30 @@ echo_tarfiles:
 		| sort` ;			\
 	echo $$FILES
 
+images_png_h:
+	cd ../hacks/images && $(MAKE)
+
 run_check::
 	../hacks/check-configs.pl --build-android $(ANDROID_HACKS)
 
-debug:: m6502.h run_check
+debug:: m6502.h run_check images_png_h
 	$(GRADLE) assembleDebug
-release:: m6502.h run_check
+release:: m6502.h run_check images_png_h
 	export APP_ABI=all ; \
 	$(GRADLE) assembleRelease
 
 
-KEYSTORE = xscreensaver.keystore
+KEYSTORE = xscreensaver.jks
 $(KEYSTORE):
 	keytool -genkey -v -keystore $@ \
 	-alias xscreensaver -keyalg RSA -keysize 2048 -validity 10000
 
-APK_DIR       = project/xscreensaver/build/outputs/apk/
-APK_UNSIGNED  = $(APK_DIR)/xscreensaver-release-unsigned.apk
-APK_UNALIGNED = $(APK_DIR)/xscreensaver-release-unaligned.apk
-APK_SIGNED    = $(APK_DIR)/xscreensaver-release.apk
+APK_DIR       = xscreensaver/build/outputs/apk/release/
+APK_UNSIGNED  = $(APK_DIR)xscreensaver-release-unsigned.apk
+APK_UNALIGNED = $(APK_DIR)xscreensaver-release-unaligned.apk
+APK_SIGNED    = $(APK_DIR)xscreensaver-release.apk
 
-  TOOLDIR = $(shell echo $$HOME/Library/Android/sdk/build-tools/* | tail -1)
+  TOOLDIR = $(shell ls -d $$HOME/Library/Android/sdk/build-tools/* | tail -1)
  ZIPALIGN = $(TOOLDIR)/zipalign
 JARSIGNER = jarsigner