From patchwork Mon Feb 13 10:13:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: alexandros.frantzis@linaro.org X-Patchwork-Id: 6766 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 84B9923ECA for ; Mon, 13 Feb 2012 10:31:36 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 295CEA1875F for ; Mon, 13 Feb 2012 10:31:36 +0000 (UTC) Received: by iabz7 with SMTP id z7so5329830iab.11 for ; Mon, 13 Feb 2012 02:31:35 -0800 (PST) Received: by 10.43.48.65 with SMTP id uv1mr7505462icb.57.1329129095563; Mon, 13 Feb 2012 02:31:35 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.66.135 with SMTP id n7cs51315ibi; Mon, 13 Feb 2012 02:31:34 -0800 (PST) Received: by 10.216.133.204 with SMTP id q54mr4429376wei.2.1329129093397; Mon, 13 Feb 2012 02:31:33 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id z9si11954374wiz.2.2012.02.13.02.31.32 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 13 Feb 2012 02:31:33 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1RwtC0-0000Cy-Ku for ; Mon, 13 Feb 2012 10:31:32 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id ED872E169D for ; Mon, 13 Feb 2012 10:13:12 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: glmark2 X-Launchpad-Branch: ~glmark2-dev/glmark2/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 196 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [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> Date: Mon, 13 Feb 2012 10:13:12 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14781"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 0ebcd3831ad12dc6e5ffe7eebdf601ebc7c21d0a X-Gm-Message-State: ALoCoQk5DmpxuRMWx1U/Uk2M7bbsXLOoU9rEN5AHgLmDqHnb5uxEd1bZoEzM2QtwTNGjZJnbJmTZ ------------------------------------------------------------ revno: 196 committer: Alexandros Frantzis 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 === 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