diff mbox

[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
State Accepted
Headers show

Commit Message

Alexandros Frantzis July 21, 2011, 12:36 p.m. UTC 
------------------------------------------------------------
revno: 54
committer: Alexandros Frantzis <alf82@freemail.gr>
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
diff mbox

Patch

=== 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