diff mbox

[Branch,~glmark2-dev/glmark2/trunk] Rev 196: Build: Update and synchronize X11 and Android compilation flags.

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

Commit Message

alexandros.frantzis@linaro.org Feb. 13, 2012, 10:13 a.m. UTC 
------------------------------------------------------------
revno: 196
committer: Alexandros Frantzis <alexandros.frantzis@linaro.org>
branch nick: trunk
timestamp: Mon 2012-02-13 12:05:30 +0200
message:
  Build: Update and synchronize X11 and Android compilation flags.
  
  Add -Wnon-virtual-dtor, and remove -fms-extensions, as it is not used any more.
modified:
  android/jni/Android.mk
  android/jni/Android.ndk.mk
  wscript


--
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	2012-01-27 12:00:56 +0000
+++ android/jni/Android.mk	2012-02-13 10:05:30 +0000
@@ -4,7 +4,7 @@ 
 
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_MODULE := libglmark2-matrix
-LOCAL_CFLAGS := -DUSE_GLESv2
+LOCAL_CFLAGS := -DUSE_GLESv2 -Werror -Wall -Wextra -Wnon-virtual-dtor
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/src
 LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/src/libmatrix/*.cc))
 LOCAL_SHARED_LIBRARIES := libdl libstlport
@@ -26,7 +26,8 @@ 
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libglmark2-android
 LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png
-LOCAL_CFLAGS := -DUSE_GLESv2 -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.01\""
+LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.01\"" \
+                -DUSE_GLESv2 -Werror -Wall -Wextra -Wnon-virtual-dtor
 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	2012-01-27 12:00:56 +0000
+++ android/jni/Android.ndk.mk	2012-02-13 10:05:30 +0000
@@ -4,7 +4,7 @@ 
 
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_MODULE := libglmark2-matrix
-LOCAL_CFLAGS := -DUSE_GLESv2
+LOCAL_CFLAGS := -DUSE_GLESv2 -Werror -Wall -Wextra -Wnon-virtual-dtor
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/src
 LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/src/libmatrix/*.cc))
 
@@ -22,7 +22,8 @@ 
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libglmark2-android
 LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png
-LOCAL_CFLAGS := -DUSE_GLESv2 -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.01\""
+LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.01\"" \
+                -DUSE_GLESv2 -Werror -Wall -Wextra -Wnon-virtual-dtor
 LOCAL_LDLIBS := -landroid -llog -lGLESv2 -lEGL -lz
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/src \
                     $(LOCAL_PATH)/src/libmatrix \

=== modified file 'wscript'
--- wscript	2012-01-19 18:13:38 +0000
+++ wscript	2012-02-13 10:05:30 +0000
@@ -65,7 +65,7 @@ 
         ctx.check_cfg(package = pkg, uselib_store = uselib,
                       args = '--cflags --libs', mandatory = mandatory)
 
-    ctx.env.append_unique('CXXFLAGS', '-Wall -Werror -Wextra -fms-extensions'.split(' '))
+    ctx.env.append_unique('CXXFLAGS', '-Werror -Wall -Wextra -Wnon-virtual-dtor'.split(' '))
 
     # Prepend -O# and -g flags so that they can be overriden by the
     # CFLAGS environment variable