SF.net SVN: alleg:[15490] allegro/branches/5.1/android-project

[<str...@us...>]

Revision: 15490
          http://alleg.svn.sourceforge.net/alleg/?rev=15490&view=rev
Author:   strangemoose
Date:     2012-03-25 22:56:36 +0000 (Sun, 25 Mar 2012)
Log Message:
-----------
fix compile error in android example s/display/dpy/

Modified Paths:
--------------
    allegro/branches/5.1/android-project/jni/main.c
    allegro/branches/5.1/android-project/run.sh

Modified: allegro/branches/5.1/android-project/jni/main.c
===================================================================
--- allegro/branches/5.1/android-project/jni/main.c	2012-03-25 19:49:54 UTC (rev 15489)
+++ allegro/branches/5.1/android-project/jni/main.c	2012-03-25 22:56:36 UTC (rev 15490)
@@ -171,15 +171,15 @@
                break;
 
 	    case ALLEGRO_EVENT_DISPLAY_ORIENTATION: {
-               int w = al_get_display_width(display);
-               int h = al_get_display_height(display);
+               int w = al_get_display_width(dpy);
+               int h = al_get_display_height(dpy);
             
                glViewport(0, 0, w, h);
             
                ALLEGRO_TRANSFORM t;
                al_identity_transform(&t);
                al_ortho_transform(&t, 0, w, h, 0, -1, 1);
-               al_set_projection_transform(display, &t);
+               al_set_projection_transform(dpy, &t);
                break;
 	    }
          }

Modified: allegro/branches/5.1/android-project/run.sh
===================================================================
--- allegro/branches/5.1/android-project/run.sh	2012-03-25 19:49:54 UTC (rev 15489)
+++ allegro/branches/5.1/android-project/run.sh	2012-03-25 22:56:36 UTC (rev 15490)
@@ -7,8 +7,8 @@
 cp ~/build/android-toolchain/user/armeabi-v7a/lib/liballegro_image-debug.so jni/armeabi-v7a/
 
 export ANDROID_NDK_TOOLCHAIN_ROOT=~/build/android-toolchain
-V=1 ~/build/android-ndk-r7/ndk-build clean
-V=1 ~/build/android-ndk-r7/ndk-build
+V=1 ~/build/android-ndk/ndk-build clean
+V=1 ~/build/android-ndk/ndk-build
 
 ant clean
 ant debug

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.