From 1041fc753b514c26512f69c8382845be23243a3b Mon Sep 17 00:00:00 2001 From: Jenkins Date: Wed, 30 Oct 2019 20:18:08 -0700 Subject: [PATCH 1/2] "Android bugfixes" --- Common_3/OS/Android/AndroidBase.cpp | 18 +++---- Common_3/OS/Android/AndroidFileSystem.cpp | 2 +- .../Transformations.NativeActivity.vcxproj | 30 ++++++------ .../AndroidManifest.xml | 2 +- .../Compute.NativeActivity.vcxproj | 24 +++++----- .../Compute.Packaging/AndroidManifest.xml | 2 +- .../FontRendering.NativeActivity.vcxproj | 24 +++++----- .../AndroidManifest.xml | 2 +- .../MaterialPlayground.NativeActivity.vcxproj | 24 +++++----- .../AndroidManifest.xml | 2 +- .../GltfViewer.NativeActivity.vcxproj | 48 +++++++++---------- .../GltfViewer.Packaging/AndroidManifest.xml | 2 +- .../UserInterface.NativeActivity.vcxproj | 16 +++---- .../AndroidManifest.xml | 2 +- ...tityComponentSystem.NativeActivity.vcxproj | 24 +++++----- .../AndroidManifest.xml | 2 +- .../Playback.NativeActivity.vcxproj | 24 +++++----- .../Playback.Packaging/AndroidManifest.xml | 2 +- .../Blending.NativeActivity.vcxproj | 24 +++++----- .../Blending.Packaging/AndroidManifest.xml | 2 +- .../JointAttachment.NativeActivity.vcxproj | 24 +++++----- .../AndroidManifest.xml | 2 +- .../PartialBlending.NativeActivity.vcxproj | 24 +++++----- .../AndroidManifest.xml | 2 +- .../AdditiveBlending.NativeActivity.vcxproj | 26 +++++----- .../AndroidManifest.xml | 2 +- .../BakedPhysics.NativeActivity.vcxproj | 24 +++++----- .../AndroidManifest.xml | 2 +- .../MultiThread.NativeActivity.vcxproj | 24 +++++----- .../MultiThread.Packaging/AndroidManifest.xml | 2 +- .../Skinning.NativeActivity.vcxproj | 24 +++++----- .../Skinning.Packaging/AndroidManifest.xml | 2 +- .../InverseKinematic.NativeActivity.vcxproj | 24 +++++----- .../AndroidManifest.xml | 2 +- .../Audio.Packaging/AndroidManifest.xml | 2 +- .../Libraries/OS/OS.vcxproj | 4 +- .../Libraries/Renderer/Renderer.vcxproj | 4 +- .../Tools/AssetPipeline/AssetPipeline.vcxproj | 1 + .../AssimpImporter/AssimpImporter.vcxproj | 1 + 39 files changed, 237 insertions(+), 235 deletions(-) diff --git a/Common_3/OS/Android/AndroidBase.cpp b/Common_3/OS/Android/AndroidBase.cpp index 882a83269f..ded946cea3 100644 --- a/Common_3/OS/Android/AndroidBase.cpp +++ b/Common_3/OS/Android/AndroidBase.cpp @@ -272,22 +272,23 @@ int AndroidMain(void* param, IApp* app) { extern bool MemAllocInit(); extern void MemAllocExit(); - + + if (!MemAllocInit()) return EXIT_FAILURE; - if (!fsInitAPI()) - return EXIT_FAILURE; + struct android_app* android_app = (struct android_app*)param; + android_activity = android_app->activity; + AndroidFS_SetNativeActivity(android_activity); Log::Init(); - - struct android_app* android_app = (struct android_app*)param; - // Set the callback to process system events - android_app->onAppCmd = handle_cmd; + if (!fsInitAPI()) + return EXIT_FAILURE; + // Set the callback to process system events + android_app->onAppCmd = handle_cmd; pApp = app; - android_activity = android_app->activity; //Used for automated testing, if enabled app will exit after 120 frames #ifdef AUTOMATED_TESTING @@ -295,7 +296,6 @@ int AndroidMain(void* param, IApp* app) const uint32_t testingDesiredFrameCount = 120; #endif - AndroidFS_SetNativeActivity(android_activity); IApp::Settings* pSettings = &pApp->mSettings; Timer deltaTimer; diff --git a/Common_3/OS/Android/AndroidFileSystem.cpp b/Common_3/OS/Android/AndroidFileSystem.cpp index 2176530924..2cfde3eaf5 100644 --- a/Common_3/OS/Android/AndroidFileSystem.cpp +++ b/Common_3/OS/Android/AndroidFileSystem.cpp @@ -209,7 +209,7 @@ class AndroidBundleFileSystem: public FileSystem FileStream* OpenFile(const Path* filePath, FileMode mode) const override { - if (mode & (FM_WRITE | FM_APPEND) != 0) + if ((mode & (FM_WRITE | FM_APPEND)) != 0) { LOGF(LogLevel::eERROR, "Cannot open %s with mode %i: the Android bundle is read-only.", fsGetPathAsNativeString(filePath), mode); diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/01_Transformations/Transformations.NativeActivity/Transformations.NativeActivity.vcxproj b/Examples_3/Unit_Tests/Android_VisualStudio2017/01_Transformations/Transformations.NativeActivity/Transformations.NativeActivity.vcxproj index 758c10a0a2..714013e915 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/01_Transformations/Transformations.NativeActivity/Transformations.NativeActivity.vcxproj +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/01_Transformations/Transformations.NativeActivity/Transformations.NativeActivity.vcxproj @@ -162,7 +162,7 @@ NotUsing pch.h CompileAsCpp - VULKAN;ANDROID;VK_USE_PLATFORM_ANDROID_KHR;ANDROID_ARM_NEON;_DEBUG + VK_USE_PLATFORM_ANDROID_KHR;ANDROID_ARM_NEON;ANDROID;VULKAN;ANDROID_ARM_NEON;_DEBUG;USE_MEMORY_TRACKING; c++11 true -Wno-unused-variable -Wno-c++14-extensions %(AdditionalOptions) @@ -177,10 +177,10 @@ - $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\01_Transformations\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y + $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\01_Transformations\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -189,7 +189,7 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\01_Transformations\Shader pch.h CompileAsCpp c++11 - VULKAN;ANDROID;VK_USE_PLATFORM_ANDROID_KHR;ANDROID_ARM_NEON;%(PreprocessorDefinitions) + VK_USE_PLATFORM_ANDROID_KHR;ANDROID_ARM_NEON;ANDROID;VULKAN;ANDROID_ARM_NEON;%(PreprocessorDefinitions) -Wno-c++14-extensions %(AdditionalOptions) true @@ -204,9 +204,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\01_Transformations\Shader $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\01_Transformations\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\01_Transformations\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -233,9 +233,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\01_Transformations\Shader $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\01_Transformations\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\01_Transformations\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -266,9 +266,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\01_Transformations\Shader $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\01_Transformations\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\01_Transformations\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/01_Transformations/Transformations.Packaging/AndroidManifest.xml b/Examples_3/Unit_Tests/Android_VisualStudio2017/01_Transformations/Transformations.Packaging/AndroidManifest.xml index da180f7e6a..52dd6d4559 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/01_Transformations/Transformations.Packaging/AndroidManifest.xml +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/01_Transformations/Transformations.Packaging/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/02_Compute/Compute.NativeActivity/Compute.NativeActivity.vcxproj b/Examples_3/Unit_Tests/Android_VisualStudio2017/02_Compute/Compute.NativeActivity/Compute.NativeActivity.vcxproj index dd78eab368..f10d095903 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/02_Compute/Compute.NativeActivity/Compute.NativeActivity.vcxproj +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/02_Compute/Compute.NativeActivity/Compute.NativeActivity.vcxproj @@ -170,9 +170,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\02_Compute\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\02_Compute\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -196,9 +196,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\02_Compute\Shaders\Vulkan $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\02_Compute\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\02_Compute\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -224,9 +224,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\02_Compute\Shaders\Vulkan $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\02_Compute\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\02_Compute\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -252,9 +252,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\02_Compute\Shaders\Vulkan $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\02_Compute\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\02_Compute\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/02_Compute/Compute.Packaging/AndroidManifest.xml b/Examples_3/Unit_Tests/Android_VisualStudio2017/02_Compute/Compute.Packaging/AndroidManifest.xml index 6f52b107e4..d0e314714b 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/02_Compute/Compute.Packaging/AndroidManifest.xml +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/02_Compute/Compute.Packaging/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/05_FontRendering/FontRendering.NativeActivity/FontRendering.NativeActivity.vcxproj b/Examples_3/Unit_Tests/Android_VisualStudio2017/05_FontRendering/FontRendering.NativeActivity/FontRendering.NativeActivity.vcxproj index 4ecf09cc3d..8c101b9d4f 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/05_FontRendering/FontRendering.NativeActivity/FontRendering.NativeActivity.vcxproj +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/05_FontRendering/FontRendering.NativeActivity/FontRendering.NativeActivity.vcxproj @@ -173,9 +173,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\05_FontRendering\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\05_FontRendering\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -199,9 +199,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\05_FontRendering\Shaders\ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\05_FontRendering\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\05_FontRendering\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -223,9 +223,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\05_FontRendering\Shaders\ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\05_FontRendering\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\05_FontRendering\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -251,9 +251,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\05_FontRendering\Shaders\ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\05_FontRendering\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\05_FontRendering\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/05_FontRendering/FontRendering.Packaging/AndroidManifest.xml b/Examples_3/Unit_Tests/Android_VisualStudio2017/05_FontRendering/FontRendering.Packaging/AndroidManifest.xml index da180f7e6a..52dd6d4559 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/05_FontRendering/FontRendering.Packaging/AndroidManifest.xml +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/05_FontRendering/FontRendering.Packaging/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/06_MaterialPlayground/MaterialPlayground.NativeActivity/MaterialPlayground.NativeActivity.vcxproj b/Examples_3/Unit_Tests/Android_VisualStudio2017/06_MaterialPlayground/MaterialPlayground.NativeActivity/MaterialPlayground.NativeActivity.vcxproj index 78fb748785..7c68baf7f5 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/06_MaterialPlayground/MaterialPlayground.NativeActivity/MaterialPlayground.NativeActivity.vcxproj +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/06_MaterialPlayground/MaterialPlayground.NativeActivity/MaterialPlayground.NativeActivity.vcxproj @@ -198,9 +198,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\06_MaterialPlayground\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\06_MaterialPlayground\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\06_MaterialPlayground\*.lua $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Art\Hair\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Hair\ /s /y $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Art\PBR\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\PBR\ /s /y @@ -226,9 +226,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Art\PBR\*.* $(SolutionD $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\06_MaterialPlayground\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\06_MaterialPlayground\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\06_MaterialPlayground\*.lua $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Art\Hair\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Hair\ /s /y $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Art\PBR\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\PBR\ /s /y @@ -255,9 +255,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Art\PBR\*.* $(SolutionD $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\06_MaterialPlayground\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\06_MaterialPlayground\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\06_MaterialPlayground\*.lua $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Art\Hair\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Hair\ /s /y $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Art\PBR\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\PBR\ /s /y @@ -284,9 +284,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Art\PBR\*.* $(SolutionD $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\06_MaterialPlayground\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\06_MaterialPlayground\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\06_MaterialPlayground\*.lua $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Art\Hair\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Hair\ /s /y $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Art\PBR\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\PBR\ /s /y diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/06_MaterialPlayground/MaterialPlayground.Packaging/AndroidManifest.xml b/Examples_3/Unit_Tests/Android_VisualStudio2017/06_MaterialPlayground/MaterialPlayground.Packaging/AndroidManifest.xml index da180f7e6a..52dd6d4559 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/06_MaterialPlayground/MaterialPlayground.Packaging/AndroidManifest.xml +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/06_MaterialPlayground/MaterialPlayground.Packaging/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/08_GltfViewer/GltfViewer.NativeActivity/GltfViewer.NativeActivity.vcxproj b/Examples_3/Unit_Tests/Android_VisualStudio2017/08_GltfViewer/GltfViewer.NativeActivity/GltfViewer.NativeActivity.vcxproj index 38bcab0f38..60e589548e 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/08_GltfViewer/GltfViewer.NativeActivity/GltfViewer.NativeActivity.vcxproj +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/08_GltfViewer/GltfViewer.NativeActivity/GltfViewer.NativeActivity.vcxproj @@ -204,9 +204,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\08_GltfViewer\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\08_GltfViewer\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -227,9 +227,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\08_GltfViewer\Shaders\Vul $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\08_GltfViewer\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\08_GltfViewer\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -248,9 +248,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\08_GltfViewer\Shaders\Vul $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\08_GltfViewer\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\08_GltfViewer\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -269,9 +269,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\08_GltfViewer\Shaders\Vul $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\08_GltfViewer\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\08_GltfViewer\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -291,9 +291,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\08_GltfViewer\Shaders\Vul $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\08_GltfViewer\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\08_GltfViewer\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -313,9 +313,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\08_GltfViewer\Shaders\Vul $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\08_GltfViewer\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\08_GltfViewer\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -335,9 +335,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\08_GltfViewer\Shaders\Vul $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\08_GltfViewer\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\08_GltfViewer\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -357,9 +357,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\08_GltfViewer\Shaders\Vul $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\08_GltfViewer\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\08_GltfViewer\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/08_GltfViewer/GltfViewer.Packaging/AndroidManifest.xml b/Examples_3/Unit_Tests/Android_VisualStudio2017/08_GltfViewer/GltfViewer.Packaging/AndroidManifest.xml index da180f7e6a..52dd6d4559 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/08_GltfViewer/GltfViewer.Packaging/AndroidManifest.xml +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/08_GltfViewer/GltfViewer.Packaging/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/13_UserInterface/UserInterface.NativeActivity/UserInterface.NativeActivity.vcxproj b/Examples_3/Unit_Tests/Android_VisualStudio2017/13_UserInterface/UserInterface.NativeActivity/UserInterface.NativeActivity.vcxproj index 1e113400b5..e89f4f0c34 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/13_UserInterface/UserInterface.NativeActivity/UserInterface.NativeActivity.vcxproj +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/13_UserInterface/UserInterface.NativeActivity/UserInterface.NativeActivity.vcxproj @@ -174,8 +174,8 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -198,8 +198,8 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shade $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -223,8 +223,8 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shade $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -250,8 +250,8 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shade $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/13_UserInterface/UserInterface.Packaging/AndroidManifest.xml b/Examples_3/Unit_Tests/Android_VisualStudio2017/13_UserInterface/UserInterface.Packaging/AndroidManifest.xml index da180f7e6a..52dd6d4559 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/13_UserInterface/UserInterface.Packaging/AndroidManifest.xml +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/13_UserInterface/UserInterface.Packaging/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/17_EntityComponentSystem/EntityComponentSystem.NativeActivity/EntityComponentSystem.NativeActivity.vcxproj b/Examples_3/Unit_Tests/Android_VisualStudio2017/17_EntityComponentSystem/EntityComponentSystem.NativeActivity/EntityComponentSystem.NativeActivity.vcxproj index 7e2f8ef501..bea20971a4 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/17_EntityComponentSystem/EntityComponentSystem.NativeActivity/EntityComponentSystem.NativeActivity.vcxproj +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/17_EntityComponentSystem/EntityComponentSystem.NativeActivity/EntityComponentSystem.NativeActivity.vcxproj @@ -175,9 +175,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\17_EntityComponentSystem\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\17_EntityComponentSystem\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -201,9 +201,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\17_EntityComponentSystem\ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\17_EntityComponentSystem\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\17_EntityComponentSystem\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -225,9 +225,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\17_EntityComponentSystem\ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\17_EntityComponentSystem\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\17_EntityComponentSystem\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -253,9 +253,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\17_EntityComponentSystem\ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\17_EntityComponentSystem\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\17_EntityComponentSystem\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/17_EntityComponentSystem/EntityComponentSystem.Packaging/AndroidManifest.xml b/Examples_3/Unit_Tests/Android_VisualStudio2017/17_EntityComponentSystem/EntityComponentSystem.Packaging/AndroidManifest.xml index da180f7e6a..52dd6d4559 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/17_EntityComponentSystem/EntityComponentSystem.Packaging/AndroidManifest.xml +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/17_EntityComponentSystem/EntityComponentSystem.Packaging/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/18_Playback/Playback.NativeActivity/Playback.NativeActivity.vcxproj b/Examples_3/Unit_Tests/Android_VisualStudio2017/18_Playback/Playback.NativeActivity/Playback.NativeActivity.vcxproj index c260deebef..d0154f6c42 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/18_Playback/Playback.NativeActivity/Playback.NativeActivity.vcxproj +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/18_Playback/Playback.NativeActivity/Playback.NativeActivity.vcxproj @@ -199,9 +199,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\18_Playback\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\18_Playback\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -227,9 +227,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\18_Playback\Shaders\Vulka $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\18_Playback\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\18_Playback\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -255,9 +255,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\18_Playback\Shaders\Vulka $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\18_Playback\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\18_Playback\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -283,9 +283,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\18_Playback\Shaders\Vulka $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\18_Playback\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\18_Playback\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/18_Playback/Playback.Packaging/AndroidManifest.xml b/Examples_3/Unit_Tests/Android_VisualStudio2017/18_Playback/Playback.Packaging/AndroidManifest.xml index da180f7e6a..52dd6d4559 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/18_Playback/Playback.Packaging/AndroidManifest.xml +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/18_Playback/Playback.Packaging/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/19_Blending/Blending.NativeActivity/Blending.NativeActivity.vcxproj b/Examples_3/Unit_Tests/Android_VisualStudio2017/19_Blending/Blending.NativeActivity/Blending.NativeActivity.vcxproj index 5d3464b53a..b158630da9 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/19_Blending/Blending.NativeActivity/Blending.NativeActivity.vcxproj +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/19_Blending/Blending.NativeActivity/Blending.NativeActivity.vcxproj @@ -198,9 +198,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\19_Blending\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\19_Blending\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -226,9 +226,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\19_Blending\Shaders\Vulka $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\19_Blending\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\19_Blending\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -254,9 +254,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\19_Blending\Shaders\Vulka $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\19_Blending\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\19_Blending\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -282,9 +282,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\19_Blending\Shaders\Vulka $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\19_Blending\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\19_Blending\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/19_Blending/Blending.Packaging/AndroidManifest.xml b/Examples_3/Unit_Tests/Android_VisualStudio2017/19_Blending/Blending.Packaging/AndroidManifest.xml index da180f7e6a..52dd6d4559 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/19_Blending/Blending.Packaging/AndroidManifest.xml +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/19_Blending/Blending.Packaging/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/20_JointAttachment/JointAttachment.NativeActivity/JointAttachment.NativeActivity.vcxproj b/Examples_3/Unit_Tests/Android_VisualStudio2017/20_JointAttachment/JointAttachment.NativeActivity/JointAttachment.NativeActivity.vcxproj index dc66fdadc3..96f5a85a76 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/20_JointAttachment/JointAttachment.NativeActivity/JointAttachment.NativeActivity.vcxproj +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/20_JointAttachment/JointAttachment.NativeActivity/JointAttachment.NativeActivity.vcxproj @@ -198,9 +198,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\20_JointAttachment\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\20_JointAttachment\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -226,9 +226,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\20_JointAttachment\Shader $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\20_JointAttachment\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\20_JointAttachment\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -254,9 +254,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\20_JointAttachment\Shader $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\20_JointAttachment\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\20_JointAttachment\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -282,9 +282,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\20_JointAttachment\Shader $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\20_JointAttachment\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\20_JointAttachment\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/20_JointAttachment/JointAttachment.Packaging/AndroidManifest.xml b/Examples_3/Unit_Tests/Android_VisualStudio2017/20_JointAttachment/JointAttachment.Packaging/AndroidManifest.xml index da180f7e6a..52dd6d4559 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/20_JointAttachment/JointAttachment.Packaging/AndroidManifest.xml +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/20_JointAttachment/JointAttachment.Packaging/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/21_PartialBlending/PartialBlending.NativeActivity/PartialBlending.NativeActivity.vcxproj b/Examples_3/Unit_Tests/Android_VisualStudio2017/21_PartialBlending/PartialBlending.NativeActivity/PartialBlending.NativeActivity.vcxproj index 43bff2f8aa..4d8dd1d2b7 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/21_PartialBlending/PartialBlending.NativeActivity/PartialBlending.NativeActivity.vcxproj +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/21_PartialBlending/PartialBlending.NativeActivity/PartialBlending.NativeActivity.vcxproj @@ -198,9 +198,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\21_PartialBlending\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\21_PartialBlending\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -226,9 +226,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\21_PartialBlending\Shader $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\21_PartialBlending\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\21_PartialBlending\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -254,9 +254,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\21_PartialBlending\Shader $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\21_PartialBlending\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\21_PartialBlending\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -282,9 +282,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\21_PartialBlending\Shader $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\21_PartialBlending\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\21_PartialBlending\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/21_PartialBlending/PartialBlending.Packaging/AndroidManifest.xml b/Examples_3/Unit_Tests/Android_VisualStudio2017/21_PartialBlending/PartialBlending.Packaging/AndroidManifest.xml index da180f7e6a..52dd6d4559 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/21_PartialBlending/PartialBlending.Packaging/AndroidManifest.xml +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/21_PartialBlending/PartialBlending.Packaging/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/22_AdditiveBlending/AdditiveBlending.NativeActivity/AdditiveBlending.NativeActivity.vcxproj b/Examples_3/Unit_Tests/Android_VisualStudio2017/22_AdditiveBlending/AdditiveBlending.NativeActivity/AdditiveBlending.NativeActivity.vcxproj index 6bf90e6977..ca94ff93c3 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/22_AdditiveBlending/AdditiveBlending.NativeActivity/AdditiveBlending.NativeActivity.vcxproj +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/22_AdditiveBlending/AdditiveBlending.NativeActivity/AdditiveBlending.NativeActivity.vcxproj @@ -187,7 +187,7 @@ CompileAsCpp Disabled c++11 - _DEBUG;VULKAN;ANDROID;VK_USE_PLATFORM_ANDROID_KHR;ANDROID_ARM_NEON + _DEBUG;VULKAN;ANDROID;VK_USE_PLATFORM_ANDROID_KHR;ANDROID_ARM_NEON;USE_MEMORY_TRACKING; -Wno-c++14-extensions %(AdditionalOptions) true @@ -198,9 +198,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\22_AdditiveBlending\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\22_AdditiveBlending\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -226,9 +226,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\22_AdditiveBlending\Shade $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\22_AdditiveBlending\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\22_AdditiveBlending\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -254,9 +254,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\22_AdditiveBlending\Shade $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\22_AdditiveBlending\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\22_AdditiveBlending\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -282,9 +282,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\22_AdditiveBlending\Shade $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\22_AdditiveBlending\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\22_AdditiveBlending\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/22_AdditiveBlending/AdditiveBlending.Packaging/AndroidManifest.xml b/Examples_3/Unit_Tests/Android_VisualStudio2017/22_AdditiveBlending/AdditiveBlending.Packaging/AndroidManifest.xml index da180f7e6a..52dd6d4559 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/22_AdditiveBlending/AdditiveBlending.Packaging/AndroidManifest.xml +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/22_AdditiveBlending/AdditiveBlending.Packaging/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/23_BakedPhysics/BakedPhysics.NativeActivity/BakedPhysics.NativeActivity.vcxproj b/Examples_3/Unit_Tests/Android_VisualStudio2017/23_BakedPhysics/BakedPhysics.NativeActivity/BakedPhysics.NativeActivity.vcxproj index fb5b75f2ae..96cc0f76e5 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/23_BakedPhysics/BakedPhysics.NativeActivity/BakedPhysics.NativeActivity.vcxproj +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/23_BakedPhysics/BakedPhysics.NativeActivity/BakedPhysics.NativeActivity.vcxproj @@ -198,9 +198,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\23_BakedPhysics\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\23_BakedPhysics\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -226,9 +226,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\23_BakedPhysics\Shaders\V $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\23_BakedPhysics\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\23_BakedPhysics\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -254,9 +254,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\23_BakedPhysics\Shaders\V $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\23_BakedPhysics\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\23_BakedPhysics\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -282,9 +282,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\23_BakedPhysics\Shaders\V $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\23_BakedPhysics\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\23_BakedPhysics\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/23_BakedPhysics/BakedPhysics.Packaging/AndroidManifest.xml b/Examples_3/Unit_Tests/Android_VisualStudio2017/23_BakedPhysics/BakedPhysics.Packaging/AndroidManifest.xml index da180f7e6a..52dd6d4559 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/23_BakedPhysics/BakedPhysics.Packaging/AndroidManifest.xml +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/23_BakedPhysics/BakedPhysics.Packaging/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/24_MultiThread/MultiThread.NativeActivity/MultiThread.NativeActivity.vcxproj b/Examples_3/Unit_Tests/Android_VisualStudio2017/24_MultiThread/MultiThread.NativeActivity/MultiThread.NativeActivity.vcxproj index 59225788fe..6ea30dfac0 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/24_MultiThread/MultiThread.NativeActivity/MultiThread.NativeActivity.vcxproj +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/24_MultiThread/MultiThread.NativeActivity/MultiThread.NativeActivity.vcxproj @@ -198,9 +198,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\24_MultiThread\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\24_MultiThread\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y rd $(SolutionDir)$(Platform)\$(Configuration)\assets\ /s /q @@ -226,9 +226,9 @@ rd $(SolutionDir)$(Platform)\$(Configuration)\libs\ /s /q $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\24_MultiThread\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\24_MultiThread\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y rd $(SolutionDir)$(Platform)\$(Configuration)\assets\ /s /q @@ -254,9 +254,9 @@ rd $(SolutionDir)$(Platform)\$(Configuration)\libs\ /s /q $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\24_MultiThread\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\24_MultiThread\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y rd $(SolutionDir)$(Platform)\$(Configuration)\assets\ /s /q @@ -282,9 +282,9 @@ rd $(SolutionDir)$(Platform)\$(Configuration)\libs\ /s /q $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\24_MultiThread\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\24_MultiThread\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y rd $(SolutionDir)$(Platform)\$(Configuration)\assets\ /s /q diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/24_MultiThread/MultiThread.Packaging/AndroidManifest.xml b/Examples_3/Unit_Tests/Android_VisualStudio2017/24_MultiThread/MultiThread.Packaging/AndroidManifest.xml index da180f7e6a..52dd6d4559 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/24_MultiThread/MultiThread.Packaging/AndroidManifest.xml +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/24_MultiThread/MultiThread.Packaging/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/25_Skinning/Skinning.NativeActivity/Skinning.NativeActivity.vcxproj b/Examples_3/Unit_Tests/Android_VisualStudio2017/25_Skinning/Skinning.NativeActivity/Skinning.NativeActivity.vcxproj index 6ee8dff047..0e52ba64d6 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/25_Skinning/Skinning.NativeActivity/Skinning.NativeActivity.vcxproj +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/25_Skinning/Skinning.NativeActivity/Skinning.NativeActivity.vcxproj @@ -198,9 +198,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\25_Skinning\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\25_Skinning\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -226,9 +226,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\25_Skinning\Shaders\Vulka $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\25_Skinning\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\25_Skinning\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -254,9 +254,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\25_Skinning\Shaders\Vulka $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\25_Skinning\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\25_Skinning\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -282,9 +282,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\25_Skinning\Shaders\Vulka $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\25_Skinning\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\25_Skinning\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/25_Skinning/Skinning.Packaging/AndroidManifest.xml b/Examples_3/Unit_Tests/Android_VisualStudio2017/25_Skinning/Skinning.Packaging/AndroidManifest.xml index da180f7e6a..52dd6d4559 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/25_Skinning/Skinning.Packaging/AndroidManifest.xml +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/25_Skinning/Skinning.Packaging/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/26_InverseKinematic/InverseKinematic.NativeActivity/InverseKinematic.NativeActivity.vcxproj b/Examples_3/Unit_Tests/Android_VisualStudio2017/26_InverseKinematic/InverseKinematic.NativeActivity/InverseKinematic.NativeActivity.vcxproj index 68c7e716e6..482fbe4f0a 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/26_InverseKinematic/InverseKinematic.NativeActivity/InverseKinematic.NativeActivity.vcxproj +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/26_InverseKinematic/InverseKinematic.NativeActivity/InverseKinematic.NativeActivity.vcxproj @@ -199,9 +199,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\26_InverseKinematic\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\26_InverseKinematic\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -227,9 +227,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\26_InverseKinematic\Shade $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\26_InverseKinematic\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\26_InverseKinematic\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -255,9 +255,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\26_InverseKinematic\Shade $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\26_InverseKinematic\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\26_InverseKinematic\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -283,9 +283,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\26_InverseKinematic\Shade $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y -$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\26_InverseKinematic\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\26_InverseKinematic\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/26_InverseKinematic/InverseKinematic.Packaging/AndroidManifest.xml b/Examples_3/Unit_Tests/Android_VisualStudio2017/26_InverseKinematic/InverseKinematic.Packaging/AndroidManifest.xml index da180f7e6a..52dd6d4559 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/26_InverseKinematic/InverseKinematic.Packaging/AndroidManifest.xml +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/26_InverseKinematic/InverseKinematic.Packaging/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/27_Audio/Audio.Packaging/AndroidManifest.xml b/Examples_3/Unit_Tests/Android_VisualStudio2017/27_Audio/Audio.Packaging/AndroidManifest.xml index 3aff0ace6b..52dd6d4559 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/27_Audio/Audio.Packaging/AndroidManifest.xml +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/27_Audio/Audio.Packaging/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/Libraries/OS/OS.vcxproj b/Examples_3/Unit_Tests/Android_VisualStudio2017/Libraries/OS/OS.vcxproj index 08f53e6ea1..19ca8881e8 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/Libraries/OS/OS.vcxproj +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/Libraries/OS/OS.vcxproj @@ -283,7 +283,7 @@ NotUsing pch.h - VK_USE_PLATFORM_ANDROID_KHR;ANDROID_ARM_NEON;API_EXPORT;ANDROID;USE_MEMORY_TRACKING;VULKAN;_DEBUG;%(PreprocessorDefinitions) + VK_USE_PLATFORM_ANDROID_KHR;ANDROID_ARM_NEON;API_EXPORT;ANDROID;VULKAN;_DEBUG;;USE_MEMORY_TRACKING;%(PreprocessorDefinitions) Enabled CompileAsCpp false @@ -300,7 +300,7 @@ pch.h c++11 CompileAsCpp - VK_USE_PLATFORM_ANDROID_KHR;ANDROID_ARM_NEON;API_EXPORT;ANDROID;USE_MEMORY_TRACKING;VULKAN;%(PreprocessorDefinitions) + VK_USE_PLATFORM_ANDROID_KHR;ANDROID_ARM_NEON;API_EXPORT;ANDROID;VULKAN;%(PreprocessorDefinitions) false Enabled -Wno-c++14-extensions %(AdditionalOptions) diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/Libraries/Renderer/Renderer.vcxproj b/Examples_3/Unit_Tests/Android_VisualStudio2017/Libraries/Renderer/Renderer.vcxproj index 5853a4874f..1f39d3a8a3 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/Libraries/Renderer/Renderer.vcxproj +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/Libraries/Renderer/Renderer.vcxproj @@ -203,7 +203,7 @@ pch.h c++11 CompileAsCpp - USE_MEMORY_TRACKING;VULKAN;ANDROID;_DEBUG;%(PreprocessorDefinitions) + VK_USE_PLATFORM_ANDROID_KHR;ANDROID_ARM_NEON;API_EXPORT;ANDROID;VULKAN;_DEBUG;USE_MEMORY_TRACKING;%(PreprocessorDefinitions) false -Wno-c++14-extensions %(AdditionalOptions) @@ -217,7 +217,7 @@ pch.h c++11 CompileAsCpp - USE_MEMORY_TRACKING;VULKAN;ANDROID;%(PreprocessorDefinitions) + VK_USE_PLATFORM_ANDROID_KHR;ANDROID_ARM_NEON;API_EXPORT;ANDROID;VULKAN;%(PreprocessorDefinitions) false softfp -Wno-c++14-extensions %(AdditionalOptions) diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/Libraries/Tools/AssetPipeline/AssetPipeline.vcxproj b/Examples_3/Unit_Tests/Android_VisualStudio2017/Libraries/Tools/AssetPipeline/AssetPipeline.vcxproj index 0a2ec7e798..11069eb4a7 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/Libraries/Tools/AssetPipeline/AssetPipeline.vcxproj +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/Libraries/Tools/AssetPipeline/AssetPipeline.vcxproj @@ -279,6 +279,7 @@ true softfp -Wno-c++14-extensions %(AdditionalOptions) + ;USE_MEMORY_TRACKING; -lMeshOptimizer diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/Libraries/Tools/AssimpImporter/AssimpImporter.vcxproj b/Examples_3/Unit_Tests/Android_VisualStudio2017/Libraries/Tools/AssimpImporter/AssimpImporter.vcxproj index a42f3bde5e..3bd5fae792 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/Libraries/Tools/AssimpImporter/AssimpImporter.vcxproj +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/Libraries/Tools/AssimpImporter/AssimpImporter.vcxproj @@ -225,6 +225,7 @@ Disabled CompileAsCpp -Wno-c++14-extensions %(AdditionalOptions) + ;USE_MEMORY_TRACKING; From 6bec4866f758fe5f8dbb931043c03e8d5a2faddb Mon Sep 17 00:00:00 2001 From: Jenkins Date: Thu, 31 Oct 2019 18:38:33 -0700 Subject: [PATCH 2/2] "Revert Solutions to VS2017 + android fixes" --- Common_3/Renderer/ResourceLoader.cpp | 6 ++-- .../AssetPipeline/Win64/AssetPipeline.sln | 33 +------------------ .../Win64/AssetPipelineCmd.vcxproj | 24 +++++++------- .../UserInterface.NativeActivity.vcxproj | 2 ++ .../Skinning.NativeActivity.vcxproj | 10 ++++-- .../Audio.NativeActivity.vcxproj | 10 ++++-- .../Android_VisualStudio2017/Unit_Tests.sln | 2 +- .../PC Visual Studio 2017/Unit_Tests.sln | 6 ++-- .../VisibilityBuffer.sln | 6 ++-- PyBuild.py | 9 +++-- 10 files changed, 49 insertions(+), 59 deletions(-) diff --git a/Common_3/Renderer/ResourceLoader.cpp b/Common_3/Renderer/ResourceLoader.cpp index 3dee5f2517..e50a1e8023 100644 --- a/Common_3/Renderer/ResourceLoader.cpp +++ b/Common_3/Renderer/ResourceLoader.cpp @@ -1349,9 +1349,11 @@ void vk_compileShader( } shaderc_compilation_result_t spvShader = shaderc_compile_into_spv(compiler, code, codeSize, getShadercShaderType(stage), "shaderc_error", pEntryPoint ? pEntryPoint : "main", options); - if (shaderc_result_get_compilation_status(spvShader) != shaderc_compilation_status_success) + shaderc_compilation_status spvStatus = shaderc_result_get_compilation_status(spvShader); + if (spvStatus != shaderc_compilation_status_success) { - LOGF(LogLevel::eERROR, "Shader compiling failed! with status"); + const char* errorMessage = shaderc_result_get_error_message(spvShader); + LOGF(LogLevel::eERROR, "Shader compiling failed! with status %s", errorMessage); abort(); } diff --git a/Common_3/Tools/AssetPipeline/Win64/AssetPipeline.sln b/Common_3/Tools/AssetPipeline/Win64/AssetPipeline.sln index 24d04790a7..612faa3d87 100644 --- a/Common_3/Tools/AssetPipeline/Win64/AssetPipeline.sln +++ b/Common_3/Tools/AssetPipeline/Win64/AssetPipeline.sln @@ -29,6 +29,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IrrXML", "..\..\..\ThirdPar EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AssetPipelineCmd", "AssetPipelineCmd.vcxproj", "{9BB45EC2-8F3A-4D98-A235-40EBBB559F64}" ProjectSection(ProjectDependencies) = postProject + {59586A07-8E7E-411D-BC3D-387E039AA423} = {59586A07-8E7E-411D-BC3D-387E039AA423} {86CCE738-AAA1-4327-9DE0-AAB5B23B7852} = {86CCE738-AAA1-4327-9DE0-AAB5B23B7852} EndProjectSection EndProject @@ -252,38 +253,6 @@ Global {0C80E083-8EC3-4DC4-8A93-BC30F0525A53}.ReleaseVk|x64.Build.0 = Release|x64 {0C80E083-8EC3-4DC4-8A93-BC30F0525A53}.ReleaseVk|x86.ActiveCfg = Release|Win32 {0C80E083-8EC3-4DC4-8A93-BC30F0525A53}.ReleaseVk|x86.Build.0 = Release|Win32 - {D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.Debug|x64.ActiveCfg = Debug|x64 - {D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.Debug|x64.Build.0 = Debug|x64 - {D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.Debug|x86.ActiveCfg = Debug|Win32 - {D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.Debug|x86.Build.0 = Debug|Win32 - {D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.DebugDx|x64.ActiveCfg = Debug|x64 - {D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.DebugDx|x64.Build.0 = Debug|x64 - {D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.DebugDx|x86.ActiveCfg = Debug|Win32 - {D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.DebugDx|x86.Build.0 = Debug|Win32 - {D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.DebugDx11|x64.ActiveCfg = Debug|x64 - {D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.DebugDx11|x64.Build.0 = Debug|x64 - {D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.DebugDx11|x86.ActiveCfg = Debug|Win32 - {D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.DebugDx11|x86.Build.0 = Debug|Win32 - {D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.DebugVk|x64.ActiveCfg = Debug|x64 - {D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.DebugVk|x64.Build.0 = Debug|x64 - {D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.DebugVk|x86.ActiveCfg = Debug|Win32 - {D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.DebugVk|x86.Build.0 = Debug|Win32 - {D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.Release|x64.ActiveCfg = Release|x64 - {D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.Release|x64.Build.0 = Release|x64 - {D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.Release|x86.ActiveCfg = Release|Win32 - {D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.Release|x86.Build.0 = Release|Win32 - {D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.ReleaseDx|x64.ActiveCfg = Release|x64 - {D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.ReleaseDx|x64.Build.0 = Release|x64 - {D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.ReleaseDx|x86.ActiveCfg = Release|Win32 - {D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.ReleaseDx|x86.Build.0 = Release|Win32 - {D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.ReleaseDx11|x64.ActiveCfg = Release|x64 - {D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.ReleaseDx11|x64.Build.0 = Release|x64 - {D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.ReleaseDx11|x86.ActiveCfg = Release|Win32 - {D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.ReleaseDx11|x86.Build.0 = Release|Win32 - {D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.ReleaseVk|x64.ActiveCfg = Release|x64 - {D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.ReleaseVk|x64.Build.0 = Release|x64 - {D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.ReleaseVk|x86.ActiveCfg = Release|Win32 - {D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.ReleaseVk|x86.Build.0 = Release|Win32 {9BB45EC2-8F3A-4D98-A235-40EBBB559F64}.Debug|x64.ActiveCfg = DebugVk|x64 {9BB45EC2-8F3A-4D98-A235-40EBBB559F64}.Debug|x64.Build.0 = DebugVk|x64 {9BB45EC2-8F3A-4D98-A235-40EBBB559F64}.Debug|x86.ActiveCfg = DebugDx|Win32 diff --git a/Common_3/Tools/AssetPipeline/Win64/AssetPipelineCmd.vcxproj b/Common_3/Tools/AssetPipeline/Win64/AssetPipelineCmd.vcxproj index 73f31a66f6..99ae515867 100644 --- a/Common_3/Tools/AssetPipeline/Win64/AssetPipelineCmd.vcxproj +++ b/Common_3/Tools/AssetPipeline/Win64/AssetPipelineCmd.vcxproj @@ -321,8 +321,8 @@ mkdir "$(TargetDir)ImageConvertTools\" -xcopy /Y /S "$(ProjectDir)..\..\..\..\Tools\ImageConvertTools" "$(TargetDir)ImageConvertTools\" -xcopy /Y "$(ProjectDir)..\..\..\ThirdParty\OpenSource\basis_universal\$(Configuration)\basisu.exe" "$(TargetDir)ImageConvertTools\" +$(systemroot)\System32\xcopy /Y /S "$(ProjectDir)..\..\..\..\Tools\ImageConvertTools" "$(TargetDir)ImageConvertTools\" +$(systemroot)\System32\xcopy /Y "$(ProjectDir)..\..\..\ThirdParty\OpenSource\basis_universal\$(Configuration)\basisu.exe" "$(TargetDir)ImageConvertTools\" @@ -352,8 +352,8 @@ xcopy /Y "$(ProjectDir)..\..\..\ThirdParty\OpenSource\basis_universal\$(Configur mkdir "$(TargetDir)ImageConvertTools\" -xcopy /Y /S "$(ProjectDir)..\..\..\..\Tools\ImageConvertTools" "$(TargetDir)ImageConvertTools\" -xcopy /Y "$(ProjectDir)..\..\..\ThirdParty\OpenSource\basis_universal\$(Configuration)\basisu.exe" "$(TargetDir)ImageConvertTools\" +$(systemroot)\System32\xcopy /Y /S "$(ProjectDir)..\..\..\..\Tools\ImageConvertTools" "$(TargetDir)ImageConvertTools\" +$(systemroot)\System32\xcopy /Y "$(ProjectDir)..\..\..\ThirdParty\OpenSource\basis_universal\$(Configuration)\basisu.exe" "$(TargetDir)ImageConvertTools\" @@ -383,8 +383,8 @@ xcopy /Y "$(ProjectDir)..\..\..\ThirdParty\OpenSource\basis_universal\$(Configur mkdir "$(TargetDir)ImageConvertTools\" -xcopy /Y /S "$(ProjectDir)..\..\..\..\Tools\ImageConvertTools" "$(TargetDir)ImageConvertTools\" -xcopy /Y "$(ProjectDir)..\..\..\ThirdParty\OpenSource\basis_universal\$(Configuration)\basisu.exe" "$(TargetDir)ImageConvertTools\" +$(systemroot)\System32\xcopy /Y /S "$(ProjectDir)..\..\..\..\Tools\ImageConvertTools" "$(TargetDir)ImageConvertTools\" +$(systemroot)\System32\xcopy /Y "$(ProjectDir)..\..\..\ThirdParty\OpenSource\basis_universal\$(Configuration)\basisu.exe" "$(TargetDir)ImageConvertTools\" @@ -481,8 +481,8 @@ xcopy /Y "$(ProjectDir)..\..\..\ThirdParty\OpenSource\basis_universal\$(Configur mkdir "$(TargetDir)ImageConvertTools\" -xcopy /Y /S "$(ProjectDir)..\..\..\..\Tools\ImageConvertTools" "$(TargetDir)ImageConvertTools\" -xcopy /Y "$(ProjectDir)..\..\..\ThirdParty\OpenSource\basis_universal\$(Configuration)\basisu.exe" "$(TargetDir)ImageConvertTools\" +$(systemroot)\System32\xcopy /Y /S "$(ProjectDir)..\..\..\..\Tools\ImageConvertTools" "$(TargetDir)ImageConvertTools\" +$(systemroot)\System32\xcopy /Y "$(ProjectDir)..\..\..\ThirdParty\OpenSource\basis_universal\$(Configuration)\basisu.exe" "$(TargetDir)ImageConvertTools\" @@ -516,8 +516,8 @@ xcopy /Y "$(ProjectDir)..\..\..\ThirdParty\OpenSource\basis_universal\$(Configur mkdir "$(TargetDir)ImageConvertTools\" -xcopy /Y /S "$(ProjectDir)..\..\..\..\Tools\ImageConvertTools" "$(TargetDir)ImageConvertTools\" -xcopy /Y "$(ProjectDir)..\..\..\ThirdParty\OpenSource\basis_universal\$(Configuration)\basisu.exe" "$(TargetDir)ImageConvertTools\" +$(systemroot)\System32\xcopy /Y /S "$(ProjectDir)..\..\..\..\Tools\ImageConvertTools" "$(TargetDir)ImageConvertTools\" +$(systemroot)\System32\xcopy /Y "$(ProjectDir)..\..\..\ThirdParty\OpenSource\basis_universal\$(Configuration)\basisu.exe" "$(TargetDir)ImageConvertTools\" @@ -551,8 +551,8 @@ xcopy /Y "$(ProjectDir)..\..\..\ThirdParty\OpenSource\basis_universal\$(Configur mkdir "$(TargetDir)ImageConvertTools\" -xcopy /Y /S "$(ProjectDir)..\..\..\..\Tools\ImageConvertTools" "$(TargetDir)ImageConvertTools\" -xcopy /Y "$(ProjectDir)..\..\..\ThirdParty\OpenSource\basis_universal\$(Configuration)\basisu.exe" "$(TargetDir)ImageConvertTools\" +$(systemroot)\System32\xcopy /Y /S "$(ProjectDir)..\..\..\..\Tools\ImageConvertTools" "$(TargetDir)ImageConvertTools\" +$(systemroot)\System32\xcopy /Y "$(ProjectDir)..\..\..\ThirdParty\OpenSource\basis_universal\$(Configuration)\basisu.exe" "$(TargetDir)ImageConvertTools\" diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/13_UserInterface/UserInterface.NativeActivity/UserInterface.NativeActivity.vcxproj b/Examples_3/Unit_Tests/Android_VisualStudio2017/13_UserInterface/UserInterface.NativeActivity/UserInterface.NativeActivity.vcxproj index e89f4f0c34..055c94645b 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/13_UserInterface/UserInterface.NativeActivity/UserInterface.NativeActivity.vcxproj +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/13_UserInterface/UserInterface.NativeActivity/UserInterface.NativeActivity.vcxproj @@ -162,6 +162,7 @@ c++11 -Wno-unused-variable -Wno-c++14-extensions %(AdditionalOptions) true + VK_USE_PLATFORM_ANDROID_KHR;ANDROID_ARM_NEON;ANDROID;VULKAN;ANDROID_ARM_NEON;_DEBUG; $(AndroidNativeLibs);Renderer;OS;zip;SpirvTools;gainputstatic;shaderc @@ -186,6 +187,7 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shade c++11 -Wno-c++14-extensions %(AdditionalOptions) true + VK_USE_PLATFORM_ANDROID_KHR;ANDROID_ARM_NEON;ANDROID;VULKAN;ANDROID_ARM_NEON;NDEBUG;%(PreprocessorDefinitions) $(AndroidNativeLibs);Renderer;OS;zip;SpirvTools;gainputstatic;shaderc diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/25_Skinning/Skinning.NativeActivity/Skinning.NativeActivity.vcxproj b/Examples_3/Unit_Tests/Android_VisualStudio2017/25_Skinning/Skinning.NativeActivity/Skinning.NativeActivity.vcxproj index 0e52ba64d6..b57832ee74 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/25_Skinning/Skinning.NativeActivity/Skinning.NativeActivity.vcxproj +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/25_Skinning/Skinning.NativeActivity/Skinning.NativeActivity.vcxproj @@ -197,7 +197,10 @@ $(AndroidNativeLibs);Renderer;OS;zip;SpirvTools;gainputstatic;shaderc;ozz_animation;ozz_base;AssimpImporter;assimp;IrrXML; - $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y + "$(MSBuildBinPath)\msbuild.exe" $(ProjectDir)..\..\..\..\..\Common_3\Tools\AssetPipeline\Win64\AssetPipeline.sln /p:Configuration=$(Configuration)Vk /p:Platform=x64 /p:BuildInParallel=true /t:Build +"$(ProjectDir)..\..\..\..\..\Common_3\Tools\AssetPipeline\Win64\x64\$(Configuration)Vk\AssetPipelineCmd.exe" processanimations " $(ProjectDir)../../../UnitTestResources/Animation/fbx" "$(ProjectDir)../../../UnitTestResources/Animation" + +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\25_Skinning\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -225,7 +228,10 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\25_Skinning\Shaders\Vulka $(AndroidNativeLibs);Renderer;OS;zip;SpirvTools;gainputstatic;shaderc;ozz_animation;ozz_base;AssimpImporter;assimp;IrrXML; - $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y + "$(MSBuildBinPath)\msbuild.exe" $(ProjectDir)..\..\..\..\..\Common_3\Tools\AssetPipeline\Win64\AssetPipeline.sln /p:Configuration=$(Configuration)Vk /p:Platform=x64 /p:BuildInParallel=true /t:Build +"$(ProjectDir)..\..\..\..\..\Common_3\Tools\AssetPipeline\Win64\x64\$(Configuration)Vk\AssetPipelineCmd.exe" processanimations " $(ProjectDir)../../../UnitTestResources/Animation/fbx" "$(ProjectDir)../../../UnitTestResources/Animation" + +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\25_Skinning\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/27_Audio/Audio.NativeActivity/Audio.NativeActivity.vcxproj b/Examples_3/Unit_Tests/Android_VisualStudio2017/27_Audio/Audio.NativeActivity/Audio.NativeActivity.vcxproj index da7f0aea5e..5f8b5bbe7d 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/27_Audio/Audio.NativeActivity/Audio.NativeActivity.vcxproj +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/27_Audio/Audio.NativeActivity/Audio.NativeActivity.vcxproj @@ -190,6 +190,7 @@ Disabled -Wno-c++14-extensions %(AdditionalOptions) true + VK_USE_PLATFORM_ANDROID_KHR;ANDROID_ARM_NEON;ANDROID;VULKAN;ANDROID_ARM_NEON;_DEBUG;USE_MEMORY_TRACKING; $(AndroidNativeLibs);Renderer;OS;zip;SpirvTools;gainputstatic;shaderc;soloud; @@ -197,7 +198,9 @@ $(SolutionDir)..\..\..\Common_3\ThirdParty\OpenSource\Libraries\Android-$(Platform);$(SolutionDir)..\..\..\Common_3\ThirdParty\OpenSource\Libraries\Android-$(Platform);$(SolutionDir)$(Platform)\$(Configuration)\;$(VS_Ndkroot)\sources\third_party\shaderc\libs\$(UseOfStl)\$(TargetArchAbi);$(LibraryPath);$(LibraryPath);%(AdditionalLibraryDirectories) - $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y + $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y @@ -212,6 +215,7 @@ Disabled -Wno-c++14-extensions %(AdditionalOptions) true + VK_USE_PLATFORM_ANDROID_KHR;ANDROID_ARM_NEON;ANDROID;VULKAN;ANDROID_ARM_NEON;NDEBUG;%(PreprocessorDefinitions) $(AndroidNativeLibs);Renderer;OS;zip;SpirvTools;gainputstatic;shaderc;soloud; @@ -219,7 +223,9 @@ $(SolutionDir)..\..\..\Common_3\ThirdParty\OpenSource\Libraries\Android-$(Platform);$(SolutionDir)..\..\..\Common_3\ThirdParty\OpenSource\Libraries\Android-$(Platform);$(SolutionDir)$(Platform)\$(Configuration)\;$(VS_Ndkroot)\sources\third_party\shaderc\libs\$(UseOfStl)\$(TargetArchAbi);$(LibraryPath);$(LibraryPath);%(AdditionalLibraryDirectories) - $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y + $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y +$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y diff --git a/Examples_3/Unit_Tests/Android_VisualStudio2017/Unit_Tests.sln b/Examples_3/Unit_Tests/Android_VisualStudio2017/Unit_Tests.sln index bd3126d043..3f6a631980 100644 --- a/Examples_3/Unit_Tests/Android_VisualStudio2017/Unit_Tests.sln +++ b/Examples_3/Unit_Tests/Android_VisualStudio2017/Unit_Tests.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.28307.902 -MinimumVisualStudioVersion = 10.0.40219.1 +MinimumVisualStudioVersion = 15.0.28307.438 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{108D0E74-A985-496A-9B7F-C2EBF74F983F}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{53B8EEA8-D0FA-4F02-B40E-CD648E0808F3}" diff --git a/Examples_3/Unit_Tests/PC Visual Studio 2017/Unit_Tests.sln b/Examples_3/Unit_Tests/PC Visual Studio 2017/Unit_Tests.sln index ee097cc423..67920e38fd 100644 --- a/Examples_3/Unit_Tests/PC Visual Studio 2017/Unit_Tests.sln +++ b/Examples_3/Unit_Tests/PC Visual Studio 2017/Unit_Tests.sln @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29324.140 -MinimumVisualStudioVersion = 10.0.40219.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.902 +MinimumVisualStudioVersion = 15.0.28307.438 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{21A6980D-04AA-430D-BE3D-74F151226C8B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{6CF62059-3AC3-43CD-A29E-2F1E01EA4115}" diff --git a/Examples_3/Visibility_Buffer/PC Visual Studio 2017/VisibilityBuffer.sln b/Examples_3/Visibility_Buffer/PC Visual Studio 2017/VisibilityBuffer.sln index b8937a00f8..8e56ff1e74 100644 --- a/Examples_3/Visibility_Buffer/PC Visual Studio 2017/VisibilityBuffer.sln +++ b/Examples_3/Visibility_Buffer/PC Visual Studio 2017/VisibilityBuffer.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29326.143 -MinimumVisualStudioVersion = 10.0.40219.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.902 +MinimumVisualStudioVersion = 15.0.28307.438 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VisibilityBuffer", "VisibilityBuffer.vcxproj", "{5938554B-1112-4A6D-9CA0-EDEA01CB7F3F}" ProjectSection(ProjectDependencies) = postProject {DFAAEF2D-9A5E-475E-86BA-59529DD39CF3} = {DFAAEF2D-9A5E-475E-86BA-59529DD39CF3} diff --git a/PyBuild.py b/PyBuild.py index 6152c35937..cb30aede25 100644 --- a/PyBuild.py +++ b/PyBuild.py @@ -1152,7 +1152,7 @@ def BuildAndroidProjects(skipDebug, skipRelease, printMSBuild): return -1 return 0 -def BuildWindowsProjects(xboxDefined, xboxOnly, skipDebug, skipRelease, printMSBuild, skipAura): +def BuildWindowsProjects(xboxDefined, xboxOnly, skipDebug, skipRelease, printMSBuild, skipAura, skipDX11): errorOccured = False msBuildPath = FindMSBuild17() @@ -1169,6 +1169,10 @@ def BuildWindowsProjects(xboxDefined, xboxOnly, skipDebug, skipRelease, printMSB pcConfigurations.remove("ReleaseVk") pcConfigurations.remove("ReleaseDx11") + if skipDX11: + if "DebugDx11" in pcConfigurations : pcConfigurations.remove("DebugDx11") + if "ReleaseDx11" in pcConfigurations : pcConfigurations.remove("ReleaseDx11") + #xboxConfigurations = ["Debug","Release"] xboxPlatform = "Durango" @@ -1343,6 +1347,7 @@ def MainLogic(): parser.add_argument('--skipreleasebuild', action="store_true", help='If enabled, will skip Release build.') parser.add_argument('--printbuildoutput', action="store_true", help='If enabled, will print output of project builds.') parser.add_argument('--skipaura', action="store_true", help='If enabled, will skip building aura.') + parser.add_argument('--skipdx11', action="store_true", help='If enabled, will skip building DX11.') parser.add_argument('--xcodederiveddatapath', type=str, default='Null', help = 'Uses a specific path relative to root of project for derived data. If null then it uses the default location for derived data') #TODO: remove the test in parse_args arguments = parser.parse_args() @@ -1413,7 +1418,7 @@ def MainLogic(): if arguments.android: returnCode = BuildAndroidProjects(arguments.skipdebugbuild, arguments.skipreleasebuild, arguments.printbuildoutput) else: - returnCode = BuildWindowsProjects(arguments.xbox, arguments.xboxonly, arguments.skipdebugbuild, arguments.skipreleasebuild, arguments.printbuildoutput, arguments.skipaura) + returnCode = BuildWindowsProjects(arguments.xbox, arguments.xboxonly, arguments.skipdebugbuild, arguments.skipreleasebuild, arguments.printbuildoutput, arguments.skipaura, arguments.skipdx11) elif systemOS.lower() == "linux" or systemOS.lower() == "linux2": returnCode = BuildLinuxProjects()