From 72184bcf16b746d7f8d891df0b37d95d54fdaf9c Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 27 Dec 2009 15:40:19 +0000 Subject: [PATCH] Allow root_dir to be specified relative to the executable --- direct/src/plugin_standalone/panda3dBase.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/direct/src/plugin_standalone/panda3dBase.cxx b/direct/src/plugin_standalone/panda3dBase.cxx index f1d33d45b6..adb227403a 100644 --- a/direct/src/plugin_standalone/panda3dBase.cxx +++ b/direct/src/plugin_standalone/panda3dBase.cxx @@ -141,12 +141,16 @@ run_embedded(int read_offset, int argc, char *argv[]) { read_offset = read.tellg(); read.close(); + // Make the root directory absolute + Filename root_dir_f (root_dir); + root_dir_f.make_absolute(f.get_dirname()); + // Initialize the plugin if (!P3D_initialize(P3D_API_VERSION, NULL, _host_url.c_str(), _verify_contents, _this_platform.c_str(), _log_dirname.c_str(), _log_basename.c_str(), !_enable_security, _console_environment, - root_dir.c_str())) { + root_dir_f.c_str())) { // Oops, failure to initialize. cerr << "Failed to initialize plugin (wrong API version?)\n"; return 1;