diff mbox

[Branch,~glmark2-dev/glmark2/trunk] Rev 156: Android: Display glmark2 version in logs.

Message ID 20111018141909.28464.30460.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

alexandros.frantzis@linaro.org Oct. 18, 2011, 2:19 p.m. UTC 
------------------------------------------------------------
revno: 156
committer: Alexandros Frantzis <alexandros.frantzis@linaro.org>
branch nick: trunk
timestamp: Mon 2011-10-17 13:13:12 +0300
message:
  Android: Display glmark2 version in logs.
modified:
  android/jni/Android.mk
  android/jni/Android.ndk.mk
  src/android.cpp


--
lp:glmark2
https://code.launchpad.net/~glmark2-dev/glmark2/trunk

You are subscribed to branch lp:glmark2.
To unsubscribe from this branch go to https://code.launchpad.net/~glmark2-dev/glmark2/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'android/jni/Android.mk'
--- android/jni/Android.mk	2011-08-16 12:33:21 +0000
+++ android/jni/Android.mk	2011-10-17 10:13:12 +0000
@@ -27,7 +27,7 @@ 
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libglmark2-android
 LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png
-LOCAL_CFLAGS := -DUSE_GLESv2 -DGLMARK_DATA_PATH=""
+LOCAL_CFLAGS := -DUSE_GLESv2 -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2011.09\""
 LOCAL_SHARED_LIBRARIES := liblog libz libEGL libGLESv2 libandroid libdl libstlport
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/src \
                     $(LOCAL_PATH)/src/libmatrix \

=== modified file 'android/jni/Android.ndk.mk'
--- android/jni/Android.ndk.mk	2011-08-16 12:22:17 +0000
+++ android/jni/Android.ndk.mk	2011-10-17 10:13:12 +0000
@@ -23,7 +23,7 @@ 
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libglmark2-android
 LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png
-LOCAL_CFLAGS := -DUSE_GLESv2 -DGLMARK_DATA_PATH=""
+LOCAL_CFLAGS := -DUSE_GLESv2 -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2011.09\""
 LOCAL_LDLIBS := -landroid -llog -lGLESv2 -lEGL -lz
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/src \
                     $(LOCAL_PATH)/src/libmatrix \

=== modified file 'src/android.cpp'
--- src/android.cpp	2011-10-13 15:59:20 +0000
+++ src/android.cpp	2011-10-17 10:13:12 +0000
@@ -79,7 +79,7 @@ 
     g_canvas = new CanvasAndroid(100, 100);
     g_canvas->init();
 
-    Log::info("glmark2\n");
+    Log::info("glmark2 %s\n", GLMARK_VERSION);
     g_canvas->print_info();
 
     Benchmark::register_scene(*new SceneDefaultOptions(*g_canvas));