[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41271] trunk/blender: misc small edits, remove remaining Id's

[Campbell Barton]

Revision: 41271
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41271
Author:   campbellbarton
Date:     2011-10-25 04:01:09 +0000 (Tue, 25 Oct 2011)
Log Message:
-----------
misc small edits, remove remaining Id's

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/GNUmakefile
    trunk/blender/SConstruct
    trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2011-10-24 23:32:24 UTC (rev 41270)
+++ trunk/blender/CMakeLists.txt	2011-10-25 04:01:09 UTC (rev 41271)
@@ -148,7 +148,7 @@
 endif()
 
 if(UNIX AND NOT APPLE)
-	option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support)"	ON)
+	option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)"	ON)
 	option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON)
 else()
 	# not an option for other OS's

Modified: trunk/blender/GNUmakefile
===================================================================
--- trunk/blender/GNUmakefile	2011-10-24 23:32:24 UTC (rev 41270)
+++ trunk/blender/GNUmakefile	2011-10-25 04:01:09 UTC (rev 41271)
@@ -1,6 +1,5 @@
 # -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*-
-# vim: tabstop=8
-# $Id: GNUmakefile 41122 2011-10-19 21:55:27Z campbellbarton $
+# vim: tabstop=4
 #
 # ##### BEGIN GPL LICENSE BLOCK #####
 #

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2011-10-24 23:32:24 UTC (rev 41270)
+++ trunk/blender/SConstruct	2011-10-25 04:01:09 UTC (rev 41271)
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# $Id: SConstruct 41169 2011-10-21 04:23:26Z campbellbarton $
+#
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
 # This program is free software; you can redistribute it and/or
@@ -30,6 +30,8 @@
 # Then read all SConscripts and build
 #
 # TODO: fix /FORCE:MULTIPLE on windows to get proper debug builds.
+# TODO: directory copy functions are far too complicated, see:
+#       http://wiki.blender.org/index.php/User:Ideasman42/SConsNotSimpleInstallingFiles
 
 import platform as pltfrm
 

Modified: trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp	2011-10-24 23:32:24 UTC (rev 41270)
+++ trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp	2011-10-25 04:01:09 UTC (rev 41271)
@@ -176,8 +176,8 @@
 void usage(const char* program, bool isBlenderPlayer)
 {
 	const char * consoleoption;
-	const char * filename = "";
-	const char * pathname = "";
+	const char * example_filename = "";
+	const char * example_pathname = "";
 
 #ifdef _WIN32
 	consoleoption = "-c ";
@@ -186,16 +186,16 @@
 #endif
 
 	if (isBlenderPlayer) {
-		filename = "filename.blend";
+		example_filename = "filename.blend";
 #ifdef _WIN32
-		pathname = "c:\\";
+		example_pathname = "c:\\";
 #else
-		pathname = "//home//user//";
+		example_pathname = "/home/user/";
 #endif
 	}
 	
 	printf("usage:   %s [-w [w h l t]] [-f [fw fh fb ff]] %s[-g gamengineoptions] "
-		"[-s stereomode] [-m aasamples] %s\n", program, consoleoption, filename);
+		"[-s stereomode] [-m aasamples] %s\n", program, consoleoption, example_filename);
 	printf("  -h: Prints this command summary\n\n");
 	printf("  -w: display in a window\n");
 	printf("       --Optional parameters--\n"); 
@@ -250,9 +250,9 @@
 	printf("\n");
 	printf("  - : all arguments after this are ignored, allowing python to access them from sys.argv\n");
 	printf("\n");
-	printf("example: %s -w 320 200 10 10 -g noaudio%s%s\n", program, pathname, filename);
-	printf("example: %s -g show_framerate = 0 %s%s\n", program, pathname, filename);
-	printf("example: %s -i 232421 -m 16 %s%s\n\n", program, pathname, filename);
+	printf("example: %s -w 320 200 10 10 -g noaudio%s%s\n", program, example_pathname, example_filename);
+	printf("example: %s -g show_framerate = 0 %s%s\n", program, example_pathname, example_filename);
+	printf("example: %s -i 232421 -m 16 %s%s\n\n", program, example_pathname, example_filename);
 }
 
 static void get_filename(int argc, char **argv, char *filename)