bug fixes microsoft#1656 and microsoft#1579

msb336 · Jan 9, 2019 · 1f31e68 · 1f31e68
1 parent 5246acd
commit 1f31e68
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Unity/AirLibWrapper/AirsimWrapper/Source/SimHUD/SimHUD.cpp b/Unity/AirLibWrapper/AirsimWrapper/Source/SimHUD/SimHUD.cpp
@@ -126,8 +126,6 @@ void SimHUD::createSimMode()
 bool SimHUD::getSettingsText(std::string& settingsText)
 {
 	return (
-		readSettingsTextFromFile(msr::airlib::Settings::getExecutableFullPath("settings.json"), settingsText)
-		||
 		readSettingsTextFromFile(msr::airlib::Settings::Settings::getUserDirectoryFullPath("settings.json"), settingsText));
 }
 

diff --git a/Unity/build.sh b/Unity/build.sh
@@ -7,11 +7,13 @@ if [ ! -d "linux-build" ]; then
     mkdir linux-build;
 fi
 
+
 cd linux-build;
 export CC="clang-5.0"
 export CXX="clang++-5.0"
+CMAKE="$(readlink -f ../../cmake_build/bin/cmake)"
 
-cmake ../AirLibWrapper/AirsimWrapper;
+"$CMAKE" ../../cmake ../AirLibWrapper/AirsimWrapper;
 make -j`nproc`;
 if [ ! -d "../UnityDemo/Assets/Plugins" ]; then
 	mkdir ../ UnityDemo/Assets/Plugins;