diff options
author | Jesse Barker <jesse.barker@linaro.org> | 2012-11-26 11:29:33 -0800 |
---|---|---|
committer | Jesse Barker <jesse.barker@linaro.org> | 2012-11-26 11:29:33 -0800 |
commit | a9041c49c67f0abb48abd54bde24dbe4bd48fa29 (patch) | |
tree | 30710237d4c58ca5afdbad923fe70f70750ed5c2 | |
parent | 66fef1313790c36aba33c6d5921b1b86ccaeea7e (diff) | |
download | glmark2-a9041c49c67f0abb48abd54bde24dbe4bd48fa29.tar.gz |
Build,Doc: Update files for 2012.11 release.
-rw-r--r-- | NEWS | 6 | ||||
-rw-r--r-- | android/AndroidManifest.xml | 2 | ||||
-rw-r--r-- | android/jni/Android.mk | 2 | ||||
-rw-r--r-- | android/jni/Android.ndk.mk | 2 | ||||
-rw-r--r-- | doc/glmark2.1.in | 2 | ||||
-rw-r--r-- | wscript | 2 |
6 files changed, 11 insertions, 5 deletions
@@ -1,3 +1,9 @@ +glmark2 2012.11 (20121126) +========================== + +* Add a shadow mapping benchmark (scene 'shadow'). +* Consolidate EGL interactions into a separate state object. + glmark2 2012.08 (20120817) ========================== diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index cf4fbaf..4bb5b8b 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" - android:versionName="2012.08" package="org.linaro.glmark2"> + android:versionName="2012.11" package="org.linaro.glmark2"> <application android:label="@string/app_name"> <activity android:name="org.linaro.glmark2.MainActivity" android:label="@string/title_activity_main"> diff --git a/android/jni/Android.mk b/android/jni/Android.mk index bd13feb..0f43608 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -54,7 +54,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libglmark2-android LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png libglmark2-ideas libglmark2-jpeg -LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.08\"" \ +LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.11\"" \ -DUSE_GLESv2 -Werror -Wall -Wextra -Wnon-virtual-dtor \ -Wno-error=unused-parameter LOCAL_SHARED_LIBRARIES := liblog libz libEGL libGLESv2 libandroid libdl libstlport diff --git a/android/jni/Android.ndk.mk b/android/jni/Android.ndk.mk index 91c12c3..1f3f8b9 100644 --- a/android/jni/Android.ndk.mk +++ b/android/jni/Android.ndk.mk @@ -47,7 +47,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libglmark2-android LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png libglmark2-ideas libglmark2-jpeg -LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.08\"" \ +LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.11\"" \ -DUSE_GLESv2 -Werror -Wall -Wextra -Wnon-virtual-dtor \ -Wno-error=unused-parameter LOCAL_LDLIBS := -landroid -llog -lGLESv2 -lEGL -lz diff --git a/doc/glmark2.1.in b/doc/glmark2.1.in index 6121de3..a58eacb 100644 --- a/doc/glmark2.1.in +++ b/doc/glmark2.1.in @@ -1,4 +1,4 @@ -.TH @APPNAME@ "1" "August 2012" "@appname@ @appversion@" +.TH @APPNAME@ "1" "November 2012" "@appname@ @appversion@" .SH NAME @appname@ \- OpenGL (ES) 2.0 benchmark suite .SH SYNOPSIS @@ -8,7 +8,7 @@ from waflib import Context out = 'build' top = '.' -VERSION = '2012.08' +VERSION = '2012.11' APPNAME = 'glmark2' def options(opt): |