[Scummvm-cvs-logs] SF.net SVN: scummvm: [23724] scummvm/branches/branch-0-9-0

[wjpalenstijn at users.sourceforge.net]

Revision: 23724
Author:   wjpalenstijn
Date:     2006-08-18 15:06:04 -0700 (Fri, 18 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23724&view=rev

Log Message:
-----------
backport to 0.9.x: slightly changed patch #1521412: Hardcoded path for theme files

Modified Paths:
--------------
    scummvm/branches/branch-0-9-0/configure
    scummvm/branches/branch-0-9-0/gui/ThemeNew.cpp
Modified: scummvm/branches/branch-0-9-0/configure
===================================================================
--- scummvm/branches/branch-0-9-0/configure	2006-08-18 21:55:11 UTC (rev 23723)
+++ scummvm/branches/branch-0-9-0/configure	2006-08-18 22:06:04 UTC (rev 23724)
@@ -292,6 +292,7 @@
   --prefix=DIR           use this prefix for installing ScummVM [/usr/local]
   --bindir=DIR           directory to install the scummvm binary in [PREFIX/bin]
   --mandir=DIR           directory to install the manpage in [PREFIX/man]
+  --datadir=DIR          directory to install the data files in [PREFIX/share]
 
 Special configuration feature:
   --host=HOST            cross-compile to target HOST (arm-linux, ...)
@@ -483,6 +484,9 @@
       --mandir=*)
         _mandir=`echo $ac_option | cut -d '=' -f 2`
         ;;
+      --datadir=*)
+        _datadir=`echo $ac_option | cut -d '=' -f 2`
+        ;;
       *)
         echo "error: unrecognised option: $ac_option
 Try \`$0 --help' for more information." >&2
@@ -1242,7 +1246,11 @@
 #
 test -z "$_bindir" && _bindir="$_prefix/bin"
 test -z "$_mandir" && _mandir="$_prefix/man"
+test -z "$_datadir" && _datadir="$_prefix/share"
 
+DEFINES="$DEFINES -DDATA_PATH=\\\"$_datadir/scummvm\\\""
+
+
 #
 # Check which engines ("frontends") are to be built
 #

Modified: scummvm/branches/branch-0-9-0/gui/ThemeNew.cpp
===================================================================
--- scummvm/branches/branch-0-9-0/gui/ThemeNew.cpp	2006-08-18 21:55:11 UTC (rev 23723)
+++ scummvm/branches/branch-0-9-0/gui/ThemeNew.cpp	2006-08-18 22:06:04 UTC (rev 23724)
@@ -76,6 +76,10 @@
 	if (ConfMan.hasKey("themepath"))
 		Common::File::addDefaultDirectory(ConfMan.get("themepath"));
 
+#ifdef DATA_PATH
+	Common::File::addDefaultDirectoryRecursive(DATA_PATH);
+#endif
+
 	if (ConfMan.hasKey("extrapath"))
 		Common::File::addDefaultDirectoryRecursive(ConfMan.get("extrapath"));
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.