diff options
| author | Simon Rettberg | 2019-02-18 11:55:41 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-02-18 11:55:41 +0100 |
| commit | ae69a754244c4e475c8d2591772ca8e005071d83 (patch) | |
| tree | 58b3fa7abc2dcfe3c23e1c0ce108950c720826ab /android/xscreensaver/jni | |
| parent | Update gitignore (diff) | |
| download | xscreensaver-ae69a754244c4e475c8d2591772ca8e005071d83.tar.gz xscreensaver-ae69a754244c4e475c8d2591772ca8e005071d83.tar.xz xscreensaver-ae69a754244c4e475c8d2591772ca8e005071d83.zip | |
Update to 5.42
Diffstat (limited to 'android/xscreensaver/jni')
| -rw-r--r-- | android/xscreensaver/jni/Android.mk | 1 | ||||
| -rw-r--r-- | android/xscreensaver/jni/Application.mk | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/android/xscreensaver/jni/Android.mk b/android/xscreensaver/jni/Android.mk index 1e20a83..3396bd9 100644 --- a/android/xscreensaver/jni/Android.mk +++ b/android/xscreensaver/jni/Android.mk @@ -73,6 +73,7 @@ LOCAL_SRC_FILES += \ hacks/glx/gllist.c \ hacks/glx/glschool_alg.c \ hacks/glx/glschool_gl.c \ + hacks/glx/handsy_model.c \ hacks/glx/involute.c \ hacks/glx/lament_model.c \ hacks/glx/pipeobjs.c \ diff --git a/android/xscreensaver/jni/Application.mk b/android/xscreensaver/jni/Application.mk index d3f5436..311946d 100644 --- a/android/xscreensaver/jni/Application.mk +++ b/android/xscreensaver/jni/Application.mk @@ -1,7 +1,7 @@ # Get this value from android/Makefile APP_ABI := $(shell echo $$APP_ABI) -APP_STL := stlport_static -APP_PLATFORM := android-14 +APP_STL := c++_static +APP_PLATFORM := android-16 # ^^ APP_PLATFORM is minimum API version supported # https://android.googlesource.com/platform/ndk/+/master/docs/user/common_problems.md#target-api-set-higher-than-device-api |