CHANGELOG:

- hard coded paths can be overridden with environment variable 'RCSS_BUNDLE_PATH'
BerlinUnited · Dec 4, 2018 · 47c10d1 · 47c10d1
1 parent 5b635f2
commit 47c10d1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/trunk/rcssserver3d/CMakeLists.txt b/trunk/rcssserver3d/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.6)
 
 project(rcssserver3d CXX C)
-set(PACKAGE_VERSION "0.7.0-naoth-2")
+set(PACKAGE_VERSION "0.7.0-naoth-3")
 
 option(RVDRAW "Enable roboviz drawings" OFF)
 if (RVDRAW)

diff --git a/trunk/rcssserver3d/rcssserver3d/main.cpp b/trunk/rcssserver3d/rcssserver3d/main.cpp
@@ -156,7 +156,13 @@ bool SimSpark::ProcessCmdLine(int argc, char* argv[])
 
 bool SimSpark::InitApp(int argc, char** argv)
 {
-    GetCore()->GetFileServer()->AddResourceLocation(RCSS_BUNDLE_PATH);
+    const char *envPrefix = getenv("RCSS_BUNDLE_PATH");
+    if (envPrefix) {
+        GetCore()->GetFileServer()->AddResourceLocation(envPrefix);
+    } else {
+        GetCore()->GetFileServer()->AddResourceLocation(RCSS_BUNDLE_PATH);
+    }
+
     GetSimulationServer()->SetSimStep(0.01f);
     PrintGreeting();