From bc055e2d9f470b5db8de73634cd40db2ff6c6918 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Sun, 27 Dec 2009 15:34:44 +0000
Subject: [PATCH] Let's pass root_dir as token, rather than trying to guess it

---
 direct/src/plugin_standalone/panda3dBase.cxx | 30 +++-----------------
 1 file changed, 4 insertions(+), 26 deletions(-)

diff --git a/direct/src/plugin_standalone/panda3dBase.cxx b/direct/src/plugin_standalone/panda3dBase.cxx
index f42d5f2b98..f1d33d45b6 100644
--- a/direct/src/plugin_standalone/panda3dBase.cxx
+++ b/direct/src/plugin_standalone/panda3dBase.cxx
@@ -95,6 +95,7 @@ run_embedded(int read_offset, int argc, char *argv[]) {
   token._value = NULL;
   string keyword;
   string value;
+  string root_dir;
   while (true) {
     curchr = read.get();
     if (curchr == 0) {
@@ -115,11 +116,13 @@ run_embedded(int read_offset, int argc, char *argv[]) {
         token._value = value.c_str();
         _tokens.push_back(token);
         
-        // Read out the width and height token
+        // Read out the tokens that may interest us
         if (keyword == "width") {
           _win_width = atoi(value.c_str());
         } else if (keyword == "height") {
           _win_height = atoi(value.c_str());
+        } else if (keyword == "root_dir") {
+          root_dir = value;
         }
       }
       curstr = "";
@@ -138,31 +141,6 @@ run_embedded(int read_offset, int argc, char *argv[]) {
   read_offset = read.tellg();
   read.close();
   
-  // Find the root directory
-  Filename root_dir (f);
-  root_dir = Filename(root_dir.get_dirname());
-#ifdef __APPLE__
-  root_dir = Filename(root_dir.get_dirname(), "Resources");
-#endif
-  if (Filename(root_dir, "contents.xml").exists()) {
-    string path = root_dir.to_os_generic();
-    if (!path.empty() && path[0] != '/') {
-      // On Windows, a leading drive letter must be preceded by an
-      // additional slash.
-      path = "/" + path;
-    }
-    path = "file://" + path;
-  }
-#if !defined(_WIN32) && !defined(__APPLE__)
-  else { // On Unix, we should try to find it in the share directory under the prefix.
-    root_dir = Filename(root_dir.get_dirname(), "share/" + f.get_basename());
-    if (Filename(root_dir, "contents.xml").exists()) {
-      string path = root_dir.to_os_generic();
-      path = "file://" + path;
-    }
-  }
-#endif
-  
   // Initialize the plugin
   if (!P3D_initialize(P3D_API_VERSION, NULL,
                       _host_url.c_str(), _verify_contents, _this_platform.c_str(),