# HG changeset patch # User John Tsiombikas # Date 1434162943 -10800 # Node ID a94af102872fa8d759b1c13b64c35016cf0b0bf0 # Parent d7fe157c402d9d4b23171ad928e68e041bab7004 minor mistake diff -r d7fe157c402d -r a94af102872f android/Makefile --- a/android/Makefile Sat Jun 13 05:32:07 2015 +0300 +++ b/android/Makefile Sat Jun 13 05:35:43 2015 +0300 @@ -65,6 +65,8 @@ clean: rm -f $(obj) $(lib) $(apk-release) $(apk-debug) $(ant_files) rm -rf $(ant_dirs) + rm -f assets/data assets/sdr + rmdir assets .PHONY: install install: install-debug diff -r d7fe157c402d -r a94af102872f src/android/amain.c --- a/src/android/amain.c Sat Jun 13 05:32:07 2015 +0300 +++ b/src/android/amain.c Sat Jun 13 05:35:43 2015 +0300 @@ -21,7 +21,7 @@ static EGLSurface surf; static EGLContext ctx; -static int win_width, win_height; +static int width, height; static int init_done; static JavaVM *jvm; @@ -128,10 +128,10 @@ { int nx = ANativeWindow_getWidth(app->window); int ny = ANativeWindow_getHeight(app->window); - if(nx != win_width || ny != win_height) { + if(nx != width || ny != height) { game_reshape(nx, ny); - win_width = nx; - win_height = ny; + width = nx; + height = ny; } } break; @@ -259,9 +259,9 @@ } eglMakeCurrent(dpy, surf, surf, ctx); - eglQuerySurface(dpy, surf, EGL_WIDTH, &win_width); - eglQuerySurface(dpy, surf, EGL_HEIGHT, &win_height); - game_reshape(win_width, win_height); + eglQuerySurface(dpy, surf, EGL_WIDTH, &width); + eglQuerySurface(dpy, surf, EGL_HEIGHT, &height); + game_reshape(width, height); return 0; }