- SCons prob, options file strings were printed with %s, changed

    to %r so special characters are quoted properly

1 files changed, 52 insertions, 52 deletions

diff --git a/SConstruct b/SConstruct
index 15cc4de9f85..ae2242e7c63 100644
--- a/SConstruct
+++ b/SConstruct
@@ -525,67 +525,67 @@ else:
     config.write ("# Configuration file containing user definable options.\n")
     config.write ("VERSION = '2.32-cvs'\n")
     config.write ("BUILD_BINARY = 'release'\n")
-    config.write ("USE_BUILDINFO = '%s'\n"%(use_buildinfo))
-    config.write ("BUILD_BLENDER_DYNAMIC = '%s'\n"%(build_blender_dynamic))
-    config.write ("BUILD_BLENDER_STATIC = '%s'\n"%(build_blender_static))
-    config.write ("BUILD_BLENDER_PLAYER = '%s'\n"%(build_blender_player))
-    config.write ("BUILD_BLENDER_PLUGIN = '%s'\n"%(build_blender_plugin))
-    config.write ("BUILD_DIR = '%s'\n"%(root_build_dir))
-    config.write ("USE_INTERNATIONAL = '%s'\n"%(use_international))
-    config.write ("BUILD_GAMEENGINE = '%s'\n"%(use_gameengine))
+    config.write ("USE_BUILDINFO = %r\n"%(use_buildinfo))
+    config.write ("BUILD_BLENDER_DYNAMIC = %r\n"%(build_blender_dynamic))
+    config.write ("BUILD_BLENDER_STATIC = %r\n"%(build_blender_static))
+    config.write ("BUILD_BLENDER_PLAYER = %r\n"%(build_blender_player))
+    config.write ("BUILD_BLENDER_PLUGIN = %r\n"%(build_blender_plugin))
+    config.write ("BUILD_DIR = %r\n"%(root_build_dir))
+    config.write ("USE_INTERNATIONAL = %r\n"%(use_international))
+    config.write ("BUILD_GAMEENGINE = %r\n"%(use_gameengine))
     if use_sumo == 'true':
         config.write ("USE_PHYSICS = 'solid'\n")
     else:
         config.write ("USE_PHYSICS = 'ode'\n")
-    config.write ("USE_OPENAL = '%s'\n"%(use_openal))
-    config.write ("USE_FMOD = '%s'\n"%(use_fmod))
-    config.write ("USE_QUICKTIME = '%s'\n"%(use_quicktime))
+    config.write ("USE_OPENAL = %r\n"%(use_openal))
+    config.write ("USE_FMOD = %r\n"%(use_fmod))
+    config.write ("USE_QUICKTIME = %r\n"%(use_quicktime))
     config.write ("\n# External library information.\n")
-    config.write ("PYTHON_INCLUDE = %s\n"%(python_include))
-    config.write ("PYTHON_LIBPATH = %s\n"%(python_libpath))
-    config.write ("PYTHON_LIBRARY = %s\n"%(python_lib))
-    config.write ("SDL_CFLAGS = %s\n"%(sdl_cflags))
-    config.write ("SDL_INCLUDE = %s\n"%(sdl_include))
-    config.write ("SDL_LIBPATH = %s\n"%(sdl_libpath))
-    config.write ("SDL_LIBRARY = %s\n"%(sdl_lib))
-    config.write ("Z_INCLUDE = %s\n"%(z_include))
-    config.write ("Z_LIBPATH = %s\n"%(z_libpath))
-    config.write ("Z_LIBRARY = %s\n"%(z_lib))
-    config.write ("PNG_INCLUDE = %s\n"%(png_include))
-    config.write ("PNG_LIBPATH = %s\n"%(png_libpath))
-    config.write ("PNG_LIBRARY = %s\n"%(png_lib))
-    config.write ("JPEG_INCLUDE = %s\n"%(jpeg_include))
-    config.write ("JPEG_LIBPATH = %s\n"%(jpeg_libpath))
-    config.write ("JPEG_LIBRARY = %s\n"%(jpeg_lib))
-    config.write ("OPENGL_INCLUDE = %s\n"%(opengl_include))
-    config.write ("OPENGL_LIBPATH = %s\n"%(opengl_libpath))
-    config.write ("OPENGL_LIBRARY = %s\n"%(opengl_lib))
-    config.write ("OPENGL_STATIC = %s\n"%(opengl_static))
+    config.write ("PYTHON_INCLUDE = %r\n"%(python_include))
+    config.write ("PYTHON_LIBPATH = %r\n"%(python_libpath))
+    config.write ("PYTHON_LIBRARY = %r\n"%(python_lib))
+    config.write ("SDL_CFLAGS = %r\n"%(sdl_cflags))
+    config.write ("SDL_INCLUDE = %r\n"%(sdl_include))
+    config.write ("SDL_LIBPATH = %r\n"%(sdl_libpath))
+    config.write ("SDL_LIBRARY = %r\n"%(sdl_lib))
+    config.write ("Z_INCLUDE = %r\n"%(z_include))
+    config.write ("Z_LIBPATH = %r\n"%(z_libpath))
+    config.write ("Z_LIBRARY = %r\n"%(z_lib))
+    config.write ("PNG_INCLUDE = %r\n"%(png_include))
+    config.write ("PNG_LIBPATH = %r\n"%(png_libpath))
+    config.write ("PNG_LIBRARY = %r\n"%(png_lib))
+    config.write ("JPEG_INCLUDE = %r\n"%(jpeg_include))
+    config.write ("JPEG_LIBPATH = %r\n"%(jpeg_libpath))
+    config.write ("JPEG_LIBRARY = %r\n"%(jpeg_lib))
+    config.write ("OPENGL_INCLUDE = %r\n"%(opengl_include))
+    config.write ("OPENGL_LIBPATH = %r\n"%(opengl_libpath))
+    config.write ("OPENGL_LIBRARY = %r\n"%(opengl_lib))
+    config.write ("OPENGL_STATIC = %r\n"%(opengl_static))
     config.write ("\n# The following information is only necessary when you've enabled support for\n")
     config.write ("# the game engine.\n")
-    config.write ("SOLID_INCLUDE = %s\n"%(solid_include))
-    config.write ("SOLID_LIBPATH = %s\n"%(solid_libpath))
-    config.write ("SOLID_LIBRARY = %s\n"%(solid_lib))
-    config.write ("QHULL_INCLUDE = %s\n"%(qhull_include))
-    config.write ("QHULL_LIBPATH = %s\n"%(qhull_libpath))
-    config.write ("QHULL_LIBRARY = %s\n"%(qhull_lib))
-    config.write ("ODE_INCLUDE = %s\n"%(ode_include))
-    config.write ("ODE_LIBPATH = %s\n"%(ode_libpath))
-    config.write ("ODE_LIBRARY = %s\n"%(ode_lib))
-    config.write ("OPENAL_INCLUDE = %s\n"%(openal_include))
-    config.write ("OPENAL_LIBPATH = %s\n"%(openal_libpath))
-    config.write ("OPENAL_LIBRARY = %s\n"%(openal_lib))
+    config.write ("SOLID_INCLUDE = %r\n"%(solid_include))
+    config.write ("SOLID_LIBPATH = %r\n"%(solid_libpath))
+    config.write ("SOLID_LIBRARY = %r\n"%(solid_lib))
+    config.write ("QHULL_INCLUDE = %r\n"%(qhull_include))
+    config.write ("QHULL_LIBPATH = %r\n"%(qhull_libpath))
+    config.write ("QHULL_LIBRARY = %r\n"%(qhull_lib))
+    config.write ("ODE_INCLUDE = %r\n"%(ode_include))
+    config.write ("ODE_LIBPATH = %r\n"%(ode_libpath))
+    config.write ("ODE_LIBRARY = %r\n"%(ode_lib))
+    config.write ("OPENAL_INCLUDE = %r\n"%(openal_include))
+    config.write ("OPENAL_LIBPATH = %r\n"%(openal_libpath))
+    config.write ("OPENAL_LIBRARY = %r\n"%(openal_lib))
     config.write ("\n# The following information is only necessary when building with\n")
     config.write ("# internationalization support.\n");
-    config.write ("FTGL_INCLUDE = %s\n"%(ftgl_include))
-    config.write ("FTGL_LIBPATH = %s\n"%(ftgl_libpath))
-    config.write ("FTGL_LIBRARY = %s\n"%(ftgl_lib))
-    config.write ("FREETYPE_INCLUDE = %s\n"%(freetype_include))
-    config.write ("FREETYPE_LIBPATH = %s\n"%(freetype_libpath))
-    config.write ("FREETYPE_LIBRARY = %s\n"%(freetype_lib))
-    config.write ("GETTEXT_INCLUDE = %s\n"%(gettext_include))
-    config.write ("GETTEXT_LIBPATH = %s\n"%(gettext_libpath))
-    config.write ("GETTEXT_LIBRARY = %s\n"%(gettext_lib))
+    config.write ("FTGL_INCLUDE = %r\n"%(ftgl_include))
+    config.write ("FTGL_LIBPATH = %r\n"%(ftgl_libpath))
+    config.write ("FTGL_LIBRARY = %r\n"%(ftgl_lib))
+    config.write ("FREETYPE_INCLUDE = %r\n"%(freetype_include))
+    config.write ("FREETYPE_LIBPATH = %r\n"%(freetype_libpath))
+    config.write ("FREETYPE_LIBRARY = %r\n"%(freetype_lib))
+    config.write ("GETTEXT_INCLUDE = %r\n"%(gettext_include))
+    config.write ("GETTEXT_LIBPATH = %r\n"%(gettext_libpath))
+    config.write ("GETTEXT_LIBRARY = %r\n"%(gettext_lib))
     config.close ()
 
 #-----------------------------------------------------------------------------