X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=android%2Fproject%2Fxscreensaver%2Fjni%2FAndroid.mk;h=d1f00b74848e11e995c653186b7699071e3acd37;hp=b29a57816c69ade46f223ec81e1f8a711ac19408;hb=d6b0217f2417bd19187f0ebc389d6c5c2233b11c;hpb=aa75c7476aeaa84cf3abc192b376a8b03c325213 diff --git a/android/project/xscreensaver/jni/Android.mk b/android/project/xscreensaver/jni/Android.mk index b29a5781..d1f00b74 100644 --- a/android/project/xscreensaver/jni/Android.mk +++ b/android/project/xscreensaver/jni/Android.mk @@ -1,4 +1,4 @@ -LOCAL_PATH := $(call my-dir) +LOCAL_PATH := $(call my-dir)/../../../.. include $(CLEAR_VARS) @@ -6,138 +6,137 @@ LOCAL_MODULE := xscreensaver # The base framework files: LOCAL_SRC_FILES := \ - xscreensaver/android/screenhack-android.c \ - xscreensaver/android/grabscreen-android.c \ - xscreensaver/jwxyz/jwxyz-android.c \ - xscreensaver/jwxyz/jwxyz-common.c \ - xscreensaver/jwxyz/jwxyz-gl.c \ - xscreensaver/jwxyz/jwxyz-timers.c \ - xscreensaver/jwxyz/jwzgles.c \ + android/screenhack-android.c \ + jwxyz/jwxyz-android.c \ + jwxyz/jwxyz-common.c \ + jwxyz/jwxyz-gl.c \ + jwxyz/jwxyz-timers.c \ + jwxyz/jwzgles.c \ # Utilities used by the hacks: LOCAL_SRC_FILES += \ - xscreensaver/hacks/analogtv.c \ - xscreensaver/hacks/delaunay.c \ - xscreensaver/hacks/fps.c \ - xscreensaver/hacks/glx/dropshadow.c \ - xscreensaver/hacks/glx/chessmodels.c \ - xscreensaver/hacks/glx/fps-gl.c \ - xscreensaver/hacks/glx/gltrackball.c \ - xscreensaver/hacks/glx/glut_stroke.c \ - xscreensaver/hacks/glx/glut_swidth.c \ - xscreensaver/hacks/glx/grab-ximage.c \ - xscreensaver/hacks/glx/marching.c \ - xscreensaver/hacks/glx/normals.c \ - xscreensaver/hacks/glx/rotator.c \ - xscreensaver/hacks/glx/sphere.c \ - xscreensaver/hacks/glx/texfont.c \ - xscreensaver/hacks/glx/trackball.c \ - xscreensaver/hacks/glx/tube.c \ - xscreensaver/hacks/glx/xpm-ximage.c \ - xscreensaver/hacks/xlockmore.c \ - xscreensaver/hacks/xpm-pixmap.c \ - xscreensaver/utils/async_netdb.c \ - xscreensaver/utils/aligned_malloc.c \ - xscreensaver/utils/colorbars.c \ - xscreensaver/utils/colors.c \ - xscreensaver/utils/erase.c \ - xscreensaver/utils/grabclient.c \ - xscreensaver/utils/hsv.c \ - xscreensaver/utils/logo.c \ - xscreensaver/utils/minixpm.c \ - xscreensaver/utils/resources.c \ - xscreensaver/utils/spline.c \ - xscreensaver/utils/textclient-mobile.c \ - xscreensaver/utils/thread_util.c \ - xscreensaver/utils/usleep.c \ - xscreensaver/utils/utf8wc.c \ - xscreensaver/utils/xft.c \ - xscreensaver/utils/yarandom.c \ + hacks/analogtv.c \ + hacks/delaunay.c \ + hacks/fps.c \ + hacks/glx/dropshadow.c \ + hacks/glx/chessmodels.c \ + hacks/glx/fps-gl.c \ + hacks/glx/gltrackball.c \ + hacks/glx/glut_stroke.c \ + hacks/glx/glut_swidth.c \ + hacks/glx/grab-ximage.c \ + hacks/glx/marching.c \ + hacks/glx/normals.c \ + hacks/glx/rotator.c \ + hacks/glx/sphere.c \ + hacks/glx/texfont.c \ + hacks/glx/trackball.c \ + hacks/glx/tube.c \ + hacks/glx/xpm-ximage.c \ + hacks/xlockmore.c \ + hacks/xpm-pixmap.c \ + utils/async_netdb.c \ + utils/aligned_malloc.c \ + utils/colorbars.c \ + utils/colors.c \ + utils/erase.c \ + utils/grabclient.c \ + utils/hsv.c \ + utils/logo.c \ + utils/minixpm.c \ + utils/resources.c \ + utils/spline.c \ + utils/textclient-mobile.c \ + utils/thread_util.c \ + utils/usleep.c \ + utils/utf8wc.c \ + utils/xft.c \ + utils/yarandom.c \ # The source files of all of the currently active hacks: LOCAL_SRC_FILES += $(shell \ for f in $$ANDROID_HACKS ; do \ if [ "$$f" = "companioncube" ]; then f="companion"; fi ; \ if [ -f "../../../../hacks/$$f.c" ]; then \ - echo "xscreensaver/hacks/$$f.c" ; \ + echo "hacks/$$f.c" ; \ else \ - echo "xscreensaver/hacks/glx/$$f.c" ; \ + echo "hacks/glx/$$f.c" ; \ fi ; \ done ) # Some savers occupy more than one source file: LOCAL_SRC_FILES += \ - xscreensaver/hacks/apple2-main.c \ - xscreensaver/hacks/asm6502.c \ - xscreensaver/hacks/pacman_ai.c \ - xscreensaver/hacks/pacman_level.c \ - xscreensaver/hacks/glx/b_draw.c \ - xscreensaver/hacks/glx/b_lockglue.c \ - xscreensaver/hacks/glx/b_sphere.c \ - xscreensaver/hacks/glx/buildlwo.c \ - xscreensaver/hacks/glx/companion_quad.c \ - xscreensaver/hacks/glx/companion_disc.c \ - xscreensaver/hacks/glx/companion_heart.c \ - xscreensaver/hacks/glx/cow_face.c \ - xscreensaver/hacks/glx/cow_hide.c \ - xscreensaver/hacks/glx/cow_hoofs.c \ - xscreensaver/hacks/glx/cow_horns.c \ - xscreensaver/hacks/glx/cow_tail.c \ - xscreensaver/hacks/glx/cow_udder.c \ - xscreensaver/hacks/glx/dolphin.c \ - xscreensaver/hacks/glx/gllist.c \ - xscreensaver/hacks/glx/glschool_alg.c \ - xscreensaver/hacks/glx/glschool_gl.c \ - xscreensaver/hacks/glx/involute.c \ - xscreensaver/hacks/glx/lament_model.c \ - xscreensaver/hacks/glx/pipeobjs.c \ - xscreensaver/hacks/glx/robot.c \ - xscreensaver/hacks/glx/robot-wireframe.c \ - xscreensaver/hacks/glx/polyhedra-gl.c \ - xscreensaver/hacks/glx/s1_1.c \ - xscreensaver/hacks/glx/s1_2.c \ - xscreensaver/hacks/glx/s1_3.c \ - xscreensaver/hacks/glx/s1_4.c \ - xscreensaver/hacks/glx/s1_5.c \ - xscreensaver/hacks/glx/s1_6.c \ - xscreensaver/hacks/glx/s1_b.c \ - xscreensaver/hacks/glx/shark.c \ - xscreensaver/hacks/glx/sonar-sim.c \ - xscreensaver/hacks/glx/sonar-icmp.c \ - xscreensaver/hacks/glx/splitflap_obj.c \ - xscreensaver/hacks/glx/sproingiewrap.c \ - xscreensaver/hacks/glx/stonerview-move.c \ - xscreensaver/hacks/glx/stonerview-osc.c \ - xscreensaver/hacks/glx/stonerview-view.c \ - xscreensaver/hacks/glx/swim.c \ - xscreensaver/hacks/glx/tangram_shapes.c \ - xscreensaver/hacks/glx/teapot.c \ - xscreensaver/hacks/glx/toast.c \ - xscreensaver/hacks/glx/toast2.c \ - xscreensaver/hacks/glx/toaster.c \ - xscreensaver/hacks/glx/toaster_base.c \ - xscreensaver/hacks/glx/toaster_handle.c \ - xscreensaver/hacks/glx/toaster_handle2.c \ - xscreensaver/hacks/glx/toaster_jet.c \ - xscreensaver/hacks/glx/toaster_knob.c \ - xscreensaver/hacks/glx/toaster_slots.c \ - xscreensaver/hacks/glx/toaster_wing.c \ - xscreensaver/hacks/glx/tronbit_idle1.c \ - xscreensaver/hacks/glx/tronbit_idle2.c \ - xscreensaver/hacks/glx/tronbit_no.c \ - xscreensaver/hacks/glx/tronbit_yes.c \ - xscreensaver/hacks/glx/tunnel_draw.c \ - xscreensaver/hacks/glx/whale.c \ + hacks/apple2-main.c \ + hacks/asm6502.c \ + hacks/pacman_ai.c \ + hacks/pacman_level.c \ + hacks/glx/b_draw.c \ + hacks/glx/b_lockglue.c \ + hacks/glx/b_sphere.c \ + hacks/glx/buildlwo.c \ + hacks/glx/companion_quad.c \ + hacks/glx/companion_disc.c \ + hacks/glx/companion_heart.c \ + hacks/glx/cow_face.c \ + hacks/glx/cow_hide.c \ + hacks/glx/cow_hoofs.c \ + hacks/glx/cow_horns.c \ + hacks/glx/cow_tail.c \ + hacks/glx/cow_udder.c \ + hacks/glx/dolphin.c \ + hacks/glx/gllist.c \ + hacks/glx/glschool_alg.c \ + hacks/glx/glschool_gl.c \ + hacks/glx/involute.c \ + hacks/glx/lament_model.c \ + hacks/glx/pipeobjs.c \ + hacks/glx/robot.c \ + hacks/glx/robot-wireframe.c \ + hacks/glx/polyhedra-gl.c \ + hacks/glx/s1_1.c \ + hacks/glx/s1_2.c \ + hacks/glx/s1_3.c \ + hacks/glx/s1_4.c \ + hacks/glx/s1_5.c \ + hacks/glx/s1_6.c \ + hacks/glx/s1_b.c \ + hacks/glx/shark.c \ + hacks/glx/sonar-sim.c \ + hacks/glx/sonar-icmp.c \ + hacks/glx/splitflap_obj.c \ + hacks/glx/sproingiewrap.c \ + hacks/glx/stonerview-move.c \ + hacks/glx/stonerview-osc.c \ + hacks/glx/stonerview-view.c \ + hacks/glx/swim.c \ + hacks/glx/tangram_shapes.c \ + hacks/glx/teapot.c \ + hacks/glx/toast.c \ + hacks/glx/toast2.c \ + hacks/glx/toaster.c \ + hacks/glx/toaster_base.c \ + hacks/glx/toaster_handle.c \ + hacks/glx/toaster_handle2.c \ + hacks/glx/toaster_jet.c \ + hacks/glx/toaster_knob.c \ + hacks/glx/toaster_slots.c \ + hacks/glx/toaster_wing.c \ + hacks/glx/tronbit_idle1.c \ + hacks/glx/tronbit_idle2.c \ + hacks/glx/tronbit_no.c \ + hacks/glx/tronbit_yes.c \ + hacks/glx/tunnel_draw.c \ + hacks/glx/whale.c \ LOCAL_LDLIBS := -lGLESv1_CM -ldl -llog -lEGL LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/xscreensaver \ - $(LOCAL_PATH)/xscreensaver/android \ - $(LOCAL_PATH)/xscreensaver/utils \ - $(LOCAL_PATH)/xscreensaver/jwxyz \ - $(LOCAL_PATH)/xscreensaver/hacks \ - $(LOCAL_PATH)/xscreensaver/hacks/glx \ + $(LOCAL_PATH) \ + $(LOCAL_PATH)/android \ + $(LOCAL_PATH)/utils \ + $(LOCAL_PATH)/jwxyz \ + $(LOCAL_PATH)/hacks \ + $(LOCAL_PATH)/hacks/glx \ # -Wnested-externs would also be here, but for Android unistd.h. LOCAL_CFLAGS += \