From patchwork Thu Jul 21 12:36:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandros Frantzis X-Patchwork-Id: 2933 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 D66D323F4D for ; Thu, 21 Jul 2011 12:42:04 +0000 (UTC) Received: from mail-qy0-f173.google.com (mail-qy0-f173.google.com [209.85.216.173]) by fiordland.canonical.com (Postfix) with ESMTP id A6198A18287 for ; Thu, 21 Jul 2011 12:42:04 +0000 (UTC) Received: by mail-qy0-f173.google.com with SMTP id 10so3962301qyk.11 for ; Thu, 21 Jul 2011 05:42:04 -0700 (PDT) Received: by 10.229.68.200 with SMTP id w8mr190148qci.114.1311252124071; Thu, 21 Jul 2011 05:42:04 -0700 (PDT) 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.229.217.78 with SMTP id hl14cs139470qcb; Thu, 21 Jul 2011 05:42:03 -0700 (PDT) Received: by 10.227.62.195 with SMTP id y3mr157418wbh.94.1311251796602; Thu, 21 Jul 2011 05:36:36 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id ey5si2391516wbb.56.2011.07.21.05.36.36; Thu, 21 Jul 2011 05:36:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) client-ip=91.189.90.139; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) smtp.mail=bounces@canonical.com Received: from loganberry.canonical.com ([91.189.90.37]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1QjsUU-0000Cf-Ju for ; Thu, 21 Jul 2011 12:36:34 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id E9ADF2E8959 for ; Thu, 21 Jul 2011 12:36:33 +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: 54 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 54: Set the version string using a compile time #define. Message-Id: <20110721123633.17019.89485.launchpad@loganberry.canonical.com> Date: Thu, 21 Jul 2011 12:36:33 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13475"; Instance="initZopeless config overlay" X-Launchpad-Hash: f8d045abe1dd4d466ca1f38747b22eebe2480369 ------------------------------------------------------------ revno: 54 committer: Alexandros Frantzis timestamp: Thu 2010-07-15 12:05:21 +0300 message: Set the version string using a compile time #define. modified: src/main.cpp src/screen-sdl.cpp 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 'src/main.cpp' --- src/main.cpp 2010-07-13 10:22:05 +0000 +++ src/main.cpp 2010-07-15 09:05:21 +0000 @@ -53,7 +53,7 @@ } printf("===================================================\n"); - printf(" GLMark 08\n"); + printf(" glmark2 %s\n", GLMARK_VERSION); printf("===================================================\n"); screen.print_info(); printf("===================================================\n"); @@ -121,7 +121,7 @@ score += scene[i]->calculate_score(); printf("===================================================\n"); - printf("Your GLMark08 Score is %u ^_^\n", score); + printf("Your glmark2 Score is %u ^_^\n", score); printf("===================================================\n"); return 0; === modified file 'src/screen-sdl.cpp' --- src/screen-sdl.cpp 2010-07-13 10:22:05 +0000 +++ src/screen-sdl.cpp 2010-07-15 09:05:21 +0000 @@ -55,7 +55,7 @@ return; } - SDL_WM_SetCaption("GLMark 08", NULL); + SDL_WM_SetCaption("glmark2 " GLMARK_VERSION, NULL); mProjection.perspective(60.0, mWidth / (float)mHeight, 1.0, 1024.0); === modified file 'wscript' --- wscript 2010-07-12 14:03:14 +0000 +++ wscript 2010-07-15 09:05:21 +0000 @@ -7,7 +7,7 @@ blddir = 'build' top = '.' -VERSION = '0.1.0' +VERSION = '10.07' APPNAME = 'glmark2' # Produce '.tar.gz' with ./waf dist @@ -75,6 +75,7 @@ conf.env.append_unique('GLMARK_DATA_PATH', Options.options.data_path) conf.env.append_unique('CXXDEFINES', 'GLMARK_DATA_PATH="%s"' % Options.options.data_path) + conf.env.append_unique('CXXDEFINES', 'GLMARK_VERSION="%s"' % VERSION) conf.env.USE_GL = Options.options.gl conf.env.USE_GLESv2 = Options.options.glesv2