From ae2fd744e5655fcc1c9bcb0ec280f16eb67d4123 Mon Sep 17 00:00:00 2001
From: assiduous <assiduous@diligentgraphics.com>
Date: Fri, 1 Jan 2021 10:31:25 -0800
Subject: Updated copyright notice

---
 NativeApp/Android/build.gradle           | 9 ++++++++-
 NativeApp/include/AppBase.hpp            | 2 +-
 NativeApp/include/NativeAppBase.hpp      | 2 +-
 NativeApp/include/Win32/Win32AppBase.hpp | 2 +-
 NativeApp/src/Win32/WinMain.cpp          | 2 +-
 5 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'NativeApp')

diff --git a/NativeApp/Android/build.gradle b/NativeApp/Android/build.gradle
index 0cb0011..f6cf7c1 100644
--- a/NativeApp/Android/build.gradle
+++ b/NativeApp/Android/build.gradle
@@ -4,6 +4,7 @@ apply from: "android_common.gradle"
 // The arcore aar library contains the native shared libraries.  These are
 // extracted before building to a temporary directory.
 def arcore_libpath = "${buildDir}/arcore-native"
+def ndk_dir = android.ndkDirectory
 
 android {
     defaultConfig {
@@ -13,7 +14,7 @@ android {
         }
         externalNativeBuild {
             cmake {
-                arguments "-DANDROID_TOOLCHAIN=clang", "-DANDROID_STL=c++_static", "-DARCORE_LIBPATH=${arcore_libpath}/jni", "-DARCORE_INCLUDE=${project.projectDir}/arcore_sdk/include"
+                arguments "-DANDROID_TOOLCHAIN=clang", "-DANDROID_STL=c++_static", "-DARCORE_LIBPATH=${arcore_libpath}/jni", "-DARCORE_INCLUDE=${project.projectDir}/arcore_sdk/include", "-DPYTHON_EXECUTABLE=C:/Users/Egor/AppData/Local/Programs/Python/Python36/python.exe"
             }
         }
     }
@@ -29,6 +30,12 @@ android {
     sourceSets {
         main {
             java.srcDirs = ['src/main/java', 'ndk_helper/src/java']
+            jniLibs {
+                // Gradle includes libraries in the following path as dependencies
+                // of your CMake or ndk-build project so that they are packaged in
+                // your app's APK.
+                srcDir "${ndk_dir}/sources/third_party/vulkan/src/build-android/jniLibs"
+            }
         }
     }
 
diff --git a/NativeApp/include/AppBase.hpp b/NativeApp/include/AppBase.hpp
index 0817226..34d99fa 100644
--- a/NativeApp/include/AppBase.hpp
+++ b/NativeApp/include/AppBase.hpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2020 Diligent Graphics LLC
+ *  Copyright 2019-2021 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/NativeApp/include/NativeAppBase.hpp b/NativeApp/include/NativeAppBase.hpp
index b37ef91..803e8ad 100644
--- a/NativeApp/include/NativeAppBase.hpp
+++ b/NativeApp/include/NativeAppBase.hpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2020 Diligent Graphics LLC
+ *  Copyright 2019-2021 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/NativeApp/include/Win32/Win32AppBase.hpp b/NativeApp/include/Win32/Win32AppBase.hpp
index 8e9553c..8d2ec09 100644
--- a/NativeApp/include/Win32/Win32AppBase.hpp
+++ b/NativeApp/include/Win32/Win32AppBase.hpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2020 Diligent Graphics LLC
+ *  Copyright 2019-2021 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/NativeApp/src/Win32/WinMain.cpp b/NativeApp/src/Win32/WinMain.cpp
index a5a3f76..89b5525 100644
--- a/NativeApp/src/Win32/WinMain.cpp
+++ b/NativeApp/src/Win32/WinMain.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2020 Diligent Graphics LLC
+ *  Copyright 2019-2021 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
-- 
cgit v1.2.3