android: new location of libs + new location of include file

adynathos · Mar 20, 2018 · 032a0b8 · 032a0b8
1 parent 9c9a93f
commit 032a0b8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Source/AugmentedUnreality/AugmentedUnreality.Build.cs b/Source/AugmentedUnreality/AugmentedUnreality.Build.cs
@@ -177,8 +177,8 @@ public void LoadOpenCV(ReadOnlyTargetRules Target)
 			var arch = "armeabi-v7a"; //Target.Architecture
 
 			var src_dir = Path.Combine(opencv_dir, "install", "Android", "sdk", "native");
-
-			var modules_lib_dir = Path.Combine(src_dir, "libs", arch);
+ 
+            var modules_lib_dir = Path.Combine(src_dir, "staticlibs", arch);
 			var opencv_libs = OpenCVModules.ConvertAll(
 				m => Path.Combine(modules_lib_dir, "lib" + m + ".a")
 			);

diff --git a/Source/AugmentedUnreality/video_sources/AURVideoSourceAndroidCamera.cpp b/Source/AugmentedUnreality/video_sources/AURVideoSourceAndroidCamera.cpp
@@ -18,7 +18,7 @@ limitations under the License.
 #include "AURVideoSourceAndroidCamera.h"
 
 #if PLATFORM_ANDROID
-#include "../../../Core/Public/Android/AndroidApplication.h"
+#include "Android/AndroidApplication.h"
 #include "Algo/Reverse.h"
 
 static UAURVideoSourceAndroidCamera* Instance = nullptr;