From 7a64138522696765c13fb23907ae9d56683b1bd6 Mon Sep 17 00:00:00 2001 From: PopcornFX Bot Date: Thu, 11 Jan 2024 16:55:33 +0100 Subject: [PATCH] UnityPlugin: Release 2.15.17 --- Native/ManagedToNative.cpp | 20 +++++++ Native/ManagedToNative.h | 2 + Native/NativeToManaged.h | 3 + Native/PKUnity_Log.h | 1 + Native/PKUnity_Scene.cpp | 28 ++++++++- Native/PKUnity_Scene.h | 1 + .../UnityRendererCache.cpp | 7 ++- Native/RuntimeManager.cpp | 17 ++++-- Native/RuntimeManager.h | 1 + README.md | 2 +- .../Documentation~/popcornfx.hdrp.md | 2 +- .../README.md | 2 +- .../package.json | 4 +- .../Documentation~/popcornfx.urp.md | 2 +- .../README.md | 2 +- .../URP_CPUParticle_LitTransparent.asset | 2 +- .../URP_CPUParticle_UnlitTransparent.asset | 2 +- ...bonCorrectDeformation_LitTransparent.asset | 2 +- ...nCorrectDeformation_UnlitTransparent.asset | 2 +- .../Materials/URP_Mesh_LitOpaque.shadergraph | 4 +- .../URP_Mesh_LitOpaqueSkinned.shadergraph | 4 +- .../URP_Mesh_LitTransparent.shadergraph | 4 +- .../URP_Mesh_UnlitOpaque.shadergraph | 4 +- .../URP_Mesh_UnlitTransparent.shadergraph | 4 +- .../Runtime/Scripts/PKFxMaterialFactoryURP.cs | 3 +- .../package.json | 4 +- .../Documentation~/popcornfx.md | 2 +- .../Editor/Scripts/PKFxAssetEditor.cs | 21 +++++-- .../Editor/Scripts/PKFxMenus.cs | 57 ++++++++++++++++++- com.persistant-studios.popcornfx/README.md | 2 +- .../Runtime/Plugins/ARM64.meta | 2 +- .../Runtime/Plugins/Android.meta | 2 +- .../Plugins/Android/libPK-UnityPlugin.so | 4 +- .../Plugins/Android/libPK-UnityPlugin.so.meta | 2 +- .../Runtime/Plugins/Android64.meta | 2 +- .../Plugins/Android64/libPK-UnityPlugin.so | 4 +- .../Android64/libPK-UnityPlugin.so.meta | 2 +- .../Runtime/Plugins/OSX.meta | 2 +- .../Plugins/OSX/libPK-UnityPlugin.dylib | 4 +- .../Plugins/OSX/libPK-UnityPlugin.dylib.meta | 2 +- .../Runtime/Plugins/iOS.meta | 2 +- .../Runtime/Plugins/iOS/ios.meta | 2 +- .../Runtime/Plugins/iOS/ios64.meta | 2 +- .../Runtime/Plugins/iOS/libPK-UnityPlugin.a | 4 +- .../Plugins/iOS/libPK-UnityPlugin.a.meta | 2 +- .../Runtime/Plugins/x86.meta | 2 +- .../Runtime/Plugins/x86/PK-UnityPlugin.dll | 4 +- .../Plugins/x86/PK-UnityPlugin.dll.meta | 2 +- .../Runtime/Plugins/x86_64.meta | 2 +- .../Runtime/Plugins/x86_64/PK-UnityPlugin.dll | 4 +- .../Plugins/x86_64/PK-UnityPlugin.dll.meta | 2 +- .../Plugins/x86_64/libPK-UnityPlugin.so | 4 +- .../Plugins/x86_64/libPK-UnityPlugin.so.meta | 2 +- .../Runtime/Scripts/Components/PKFxCamera.cs | 11 ++-- .../Runtime/Scripts/Components/PKFxLogger.cs | 2 +- .../Scripts/Components/PKFxRenderingPlugin.cs | 5 +- .../Scripts/Internal/PKFxManagedToNative.cs | 7 ++- .../Scripts/Internal/PKFxNativeToManaged.cs | 11 +++- .../Scripts/PKFxAssets/PKFxEffectAsset.cs | 2 +- .../PKFxAssets/PKFxShaderInputBindings.cs | 15 ++++- .../Runtime/Scripts/PKFxManager.cs | 14 +++++ .../PKFxMaterialFactory.cs | 55 +++++++++++------- .../PKFxRendererDescription.cs | 4 +- com.persistant-studios.popcornfx/package.json | 2 +- download_3rd_party.bat | 2 +- download_3rd_party.sh | 2 +- .../UnityStore_android/PK-Discretizers.make | 36 ++++++------ .../UnityStore_android/PK-ImporterLib.make | 36 ++++++------ .../PK-IntegrationUnity.make | 24 ++++---- .../PK-ParticlesToolbox.make | 36 ++++++------ .../PK-Plugin_CodecImage_DDS.make | 36 ++++++------ .../PK-Plugin_CodecImage_EXR.make | 36 ++++++------ .../PK-Plugin_CodecImage_HDR.make | 36 ++++++------ .../PK-Plugin_CodecImage_JPG.make | 36 ++++++------ .../PK-Plugin_CodecImage_PKM.make | 36 ++++++------ .../PK-Plugin_CodecImage_PNG.make | 36 ++++++------ .../PK-Plugin_CodecImage_PVR.make | 36 ++++++------ .../PK-Plugin_CodecImage_TGA.make | 36 ++++++------ .../PK-Plugin_CompilerBackend_CPU_VM.make | 36 ++++++------ projects/UnityStore_android/PK-RHI.make | 36 ++++++------ .../UnityStore_android/PK-RenderHelpers.make | 36 ++++++------ projects/UnityStore_android/PK-Runtime.make | 36 ++++++------ projects/UnityStore_android/PK-SampleLib.make | 36 ++++++------ .../PK-Sample_01_BasicStartup.make | 36 ++++++------ .../PK-Sample_02_BasicEvolve.make | 36 ++++++------ .../PK-Sample_02_FullIntegration.make | 36 ++++++------ .../PK-Sample_03_EngineHooks.make | 36 ++++++------ .../PK-Sample_04_EffectInterface.make | 36 ++++++------ .../PK-Sample_05_Stats.make | 36 ++++++------ .../PK-Sample_06_SimInterface.make | 36 ++++++------ .../PK-Sample_06_SimInterfaceGPU.make | 36 ++++++------ .../UnityStore_android/PK-Sample_07_LOD.make | 36 ++++++------ .../PK-Sample_08_CustomCollision.make | 36 ++++++------ .../PK-Sample_09_AsyncLoading.make | 36 ++++++------ .../PK-Sample_10_AsyncRendering.make | 36 ++++++------ .../PK-Sample_11_ThreadPool.make | 36 ++++++------ .../PK-Sample_12_GBufferSampling.make | 36 ++++++------ .../UnityStore_android/PK-UpgraderLib.make | 36 ++++++------ projects/UnityStore_android/PK-ZLib.make | 36 ++++++------ 99 files changed, 878 insertions(+), 701 deletions(-) diff --git a/Native/ManagedToNative.cpp b/Native/ManagedToNative.cpp index ac80cb19..e670b17d 100644 --- a/Native/ManagedToNative.cpp +++ b/Native/ManagedToNative.cpp @@ -215,6 +215,18 @@ extern "C" //---------------------------------------------------------------------------- + MANAGED_TO_POPCORN_CONVENTION int GetStackLogNumber() + { + if (!CRuntimeManager::IsInstanceInitialized()) + return 0; + + CUnityLog *logger = CRuntimeManager::Instance().GetLogger(); + + return (int)logger->Count(); + } + + //---------------------------------------------------------------------------- + MANAGED_TO_POPCORN_CONVENTION int UnstackLog(char *dstBuffer, int dstSize, int &logSeverity) { // DO NOT LOG AIN THIS FUNCTION! INFINITE LOOP... @@ -237,6 +249,8 @@ extern "C" return -1; } + //---------------------------------------------------------------------------- + MANAGED_TO_POPCORN_CONVENTION void SetMaxCameraCount(int count) { @@ -1015,6 +1029,12 @@ extern "C" loopback->SetVolumeMultiplier(volume); } + MANAGED_TO_POPCORN_CONVENTION bool CanSkipUpdate() + { + NEED_PK_RUNTIME_STARTED(return true); + return CRuntimeManager::Instance().CanSkipUpdate(); + } + #if defined(PK_COMPILER_CLANG) || defined(PK_COMPILER_GCC) # pragma GCC visibility pop diff --git a/Native/ManagedToNative.h b/Native/ManagedToNative.h index bdd7f444..d048474a 100644 --- a/Native/ManagedToNative.h +++ b/Native/ManagedToNative.h @@ -291,6 +291,7 @@ extern "C" MANAGED_TO_POPCORN_CONVENTION void PopcornFXShutdown(); //Log MANAGED_TO_POPCORN_CONVENTION void SetMaxLogStack(int maxLogStack); + MANAGED_TO_POPCORN_CONVENTION int GetStackLogNumber(); MANAGED_TO_POPCORN_CONVENTION int UnstackLog(char *dstBuffer, int dstSize, int &logSeverity); // Update and rendering: MANAGED_TO_POPCORN_CONVENTION void SetMaxCameraCount(int number); @@ -362,6 +363,7 @@ extern "C" MANAGED_TO_POPCORN_CONVENTION const char *GetRuntimeVersion(); MANAGED_TO_POPCORN_CONVENTION void SetApplicationLoopbackAudioVolume(float volume); + MANAGED_TO_POPCORN_CONVENTION bool CanSkipUpdate(); #if defined(PK_COMPILER_CLANG) || defined(PK_COMPILER_GCC) # pragma GCC visibility pop diff --git a/Native/NativeToManaged.h b/Native/NativeToManaged.h index 1e89aa6c..e81066cb 100644 --- a/Native/NativeToManaged.h +++ b/Native/NativeToManaged.h @@ -171,6 +171,8 @@ extern "C" int m_TextureAtlasCount; CFloat4 *m_TextureAtlas; + int m_DrawOrder; + SMeshRendererDesc() : m_MeshAsset(null) , m_ShaderVariationFlags(0) @@ -189,6 +191,7 @@ extern "C" , m_AnimDescRendering(null) , m_TextureAtlasCount(0) , m_TextureAtlas(null) + , m_DrawOrder(0) { } diff --git a/Native/PKUnity_Log.h b/Native/PKUnity_Log.h index 5b3cb163..8f55437f 100644 --- a/Native/PKUnity_Log.h +++ b/Native/PKUnity_Log.h @@ -26,6 +26,7 @@ class CUnityLog : public ILogListener s32 PopFront(SPopcornLogData &out); void SetMaxLogsCount(u32 maxLogsCount); void ClearLogs(); + u32 Count() const { return m_LogStackMain.Count(); } void StartLogs(); void ValidateLogsAtLevel(CLog::ELogLevel level, const CString &header); diff --git a/Native/PKUnity_Scene.cpp b/Native/PKUnity_Scene.cpp index dbfa7ed2..fd23ce95 100644 --- a/Native/PKUnity_Scene.cpp +++ b/Native/PKUnity_Scene.cpp @@ -171,6 +171,29 @@ void CPKFXScene::SyncPreviousUpdateAndRunDeferredCallsIFN() //---------------------------------------------------------------------------- +bool CPKFXScene::ShouldUpdatePopcorn() +{ + if (!m_WaitForUpdateOnRenderThread) + { + PK_ASSERT(m_ParticleMediumCollection != null); + if (m_ParticleMediumCollection->CanSkipUpdate()) + return false; + } + else + { + PK_ASSERT(m_ParticleMeshMediumCollection != null); + PK_ASSERT(m_ParticleMediumCollection != null); + + if (m_ParticleMediumCollection->CanSkipUpdate() && + m_ParticleMeshMediumCollection->CanSkipUpdate()) + return false; + } + + return true; +} + +//---------------------------------------------------------------------------- + void CPKFXScene::LaunchUpdate(float dt) { PK_SCOPEDPROFILE(); @@ -186,7 +209,7 @@ void CPKFXScene::LaunchUpdate(float dt) if (UpdateMode() != UpdateMode_NoUpdate) { - if (dt != 0.0f) + if (dt != 0.0f && ShouldUpdatePopcorn()) { CRuntimeManager::Instance().BeforeUpdate(); CRuntimeManager::Instance().Update(dt); @@ -194,13 +217,12 @@ void CPKFXScene::LaunchUpdate(float dt) if (!m_WaitForUpdateOnRenderThread) { PK_ASSERT(m_ParticleMeshMediumCollection == null); - - #if (PK_PARTICLES_HAS_STATS != 0) m_ParticleMediumCollection->Stats().Reset(); PopcornFX::CTimer updateTimer; updateTimer.Start(); #endif // (PK_PARTICLES_HAS_STATS != 0) + m_ParticleMediumCollection->Update(dt); while (m_ParticleMediumCollection->UpdateFence(1)) {} diff --git a/Native/PKUnity_Scene.h b/Native/PKUnity_Scene.h index b3bfe905..63340445 100644 --- a/Native/PKUnity_Scene.h +++ b/Native/PKUnity_Scene.h @@ -95,6 +95,7 @@ class CPKFXScene : public CRefCountedObject, public IParticleScene void TransformAllParticles(const CFloat3 &worldOffset); void ResolveDynamicCollisionsIFN(); + bool ShouldUpdatePopcorn(); // Both of those need to be called for the particles to be correctly updated: void SyncPreviousUpdateAndRunDeferredCallsIFN(); diff --git a/Native/RenderingIntegration/UnityRendererCache.cpp b/Native/RenderingIntegration/UnityRendererCache.cpp index 35d2ba0b..3a7385c6 100644 --- a/Native/RenderingIntegration/UnityRendererCache.cpp +++ b/Native/RenderingIntegration/UnityRendererCache.cpp @@ -422,6 +422,7 @@ bool CParticleMaterialDescMesh::InitFromRenderer(const CRendererDataMesh &render const SRendererFeaturePropertyValue *atlasBlending = renderer.m_Declaration.FindProperty(BasicRendererProperties::SID_Atlas_Blending()); m_Flags.m_ShaderVariationFlags = 0; + if (diffuse != null && diffuse->ValueB() && diffuseMap != null && !diffuseMap->ValuePath().Empty()) m_Flags.m_ShaderVariationFlags |= ShaderVariationFlags::Has_DiffuseMap; if (alphaRemap != null && alphaRemap->ValueB() && alphaRemapAlphaMap != null && !alphaRemapAlphaMap->ValuePath().Empty() && alphaRemapCursor.Valid()) @@ -482,7 +483,10 @@ bool CParticleMaterialDescMesh::InitFromRenderer(const CRendererDataMesh &render m_Flags.m_BlendMode = BlendMode::Solid; if (transparent != null && transparent->ValueB() && transparentType != null) - { + { + const SRendererFeaturePropertyValue *globalSortOverride = renderer.m_Declaration.FindProperty(BasicRendererProperties::SID_Transparent_GlobalSortOverride()); + m_Flags.m_DrawOrder = globalSortOverride != null ? globalSortOverride->ValueI().x() : 0; + if (transparentType->ValueI().x() == BasicRendererProperties::Additive) { m_Flags.m_BlendMode = BlendMode::Additive; @@ -872,6 +876,7 @@ bool CUnityRendererCache::GetRendererInfo(SMeshRendererDesc &desc) desc.m_InvSoftnessDistance = m_MaterialDescMesh.m_InvSoftnessDistance; desc.m_AlphaClipThreshold = m_MaterialDescMesh.m_AlphaThreshold; desc.m_DoubleSided = m_MaterialDescMesh.m_DoubleSided; + desc.m_DrawOrder = m_MaterialDescMesh.m_Flags.m_DrawOrder; bool fluidVAT = (m_MaterialDescMesh.m_Flags.m_ShaderVariationFlags & ShaderVariationFlags::Has_FluidVAT) != 0; bool softVAT = (m_MaterialDescMesh.m_Flags.m_ShaderVariationFlags & ShaderVariationFlags::Has_SoftVAT) != 0; diff --git a/Native/RuntimeManager.cpp b/Native/RuntimeManager.cpp index 863eeb6c..7ea075b3 100644 --- a/Native/RuntimeManager.cpp +++ b/Native/RuntimeManager.cpp @@ -1576,6 +1576,13 @@ void CRuntimeManager::AfterUpdate() //---------------------------------------------------------------------------- +bool CRuntimeManager::CanSkipUpdate() +{ + return !m_ParticleScene->ShouldUpdatePopcorn(); +} + +//---------------------------------------------------------------------------- + bool CRuntimeManager::KickBackgroundTasksIFN() { if (m_HasBackgroundTasksToKick) @@ -1638,10 +1645,10 @@ Threads::PAbstractPool CRuntimeManager::_CreateCustomThreadPool() #if defined(PK_ORBIS) // Default worker affinities on Orbis (and UNKNOWN2?): { - 1 << 2, - 1 << 3, // our main thread - 1 << 4, - 1 << 5, + 0x0C, + 0x0C, + 0x30, + 0x30, }; #elif defined(PK_LUMIN) // Default worker affinities on Lumin: @@ -1667,7 +1674,7 @@ Threads::PAbstractPool CRuntimeManager::_CreateCustomThreadPool() #if defined(PK_ORBIS) || defined(PK_UNKNOWN2) affinityMasks = kWorkerAffinities; affinityCount = PK_ARRAY_COUNT(kWorkerAffinities); - workersPriority = CThreadManager::Priority_BackgroundLow; + workersPriority = CThreadManager::Priority_High; hasExplicitAffinities = true; #elif defined(PK_LUMIN) affinityMasks = kWorkerAffinities; diff --git a/Native/RuntimeManager.h b/Native/RuntimeManager.h index fc94aad6..b459900d 100644 --- a/Native/RuntimeManager.h +++ b/Native/RuntimeManager.h @@ -187,6 +187,7 @@ class CRuntimeManager : public CNonCopyable void BeforeUpdate(); void AfterUpdate(); + bool CanSkipUpdate(); template bool AddBackgroundTask(T *functor) diff --git a/README.md b/README.md index 147ee9b4..c4ca999c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Unity PopcornFX Plugin Integrates the **PopcornFX Runtime SDK** into **Unity** as a Plugin. -* **Version:** `v2.15.16` +* **Version:** `v2.15.17` * **Unity:** `2019.4` to `2022.x` * **Platforms:** `Windows`, `Linux`, `MacOS`, `iOS`, `Android`, `PS4`, `XboxOne`, `Switch`. [Contact-us](https://www.popcornfx.com/contact-popcornfx/) to request access to the plugin for consoles. diff --git a/com.persistant-studios.popcornfx.hdrp/Documentation~/popcornfx.hdrp.md b/com.persistant-studios.popcornfx.hdrp/Documentation~/popcornfx.hdrp.md index fbefbc41..fee42101 100644 --- a/com.persistant-studios.popcornfx.hdrp/Documentation~/popcornfx.hdrp.md +++ b/com.persistant-studios.popcornfx.hdrp/Documentation~/popcornfx.hdrp.md @@ -1,6 +1,6 @@ # Unity PopcornFX Plugin Integrates the **PopcornFX Runtime SDK** into **Unity** as a Plugin. -* **Version:** `v2.15.16` +* **Version:** `v2.15.17` * **Unity:** `2019.4` to `2021.x` * **Platforms:** `Windows`, `Linux`, `MacOS`, `iOS`, `Android`, `PS4`, `XboxOne`, `Switch`. [Contact-us](http://www.popcornfx.com/contact-us/) for more information. diff --git a/com.persistant-studios.popcornfx.hdrp/README.md b/com.persistant-studios.popcornfx.hdrp/README.md index 147ee9b4..c4ca999c 100644 --- a/com.persistant-studios.popcornfx.hdrp/README.md +++ b/com.persistant-studios.popcornfx.hdrp/README.md @@ -1,7 +1,7 @@ # Unity PopcornFX Plugin Integrates the **PopcornFX Runtime SDK** into **Unity** as a Plugin. -* **Version:** `v2.15.16` +* **Version:** `v2.15.17` * **Unity:** `2019.4` to `2022.x` * **Platforms:** `Windows`, `Linux`, `MacOS`, `iOS`, `Android`, `PS4`, `XboxOne`, `Switch`. [Contact-us](https://www.popcornfx.com/contact-popcornfx/) to request access to the plugin for consoles. diff --git a/com.persistant-studios.popcornfx.hdrp/package.json b/com.persistant-studios.popcornfx.hdrp/package.json index f7b9e478..3c76c842 100644 --- a/com.persistant-studios.popcornfx.hdrp/package.json +++ b/com.persistant-studios.popcornfx.hdrp/package.json @@ -1,13 +1,13 @@ { "name": "com.persistant-studios.popcornfx.hdrp", "description": "HDRP Materials for PopcornFX.", - "version": "2.15.16", + "version": "2.15.17", "unity": "2020.2", "unityRelease": "", "displayName": "PopcornFX HDRP", "dependencies": { "com.unity.render-pipelines.core": "10.2.2", "com.unity.render-pipelines.high-definition": "10.2.2", - "com.persistant-studios.popcornfx": "2.15.16" + "com.persistant-studios.popcornfx": "2.15.17" } } diff --git a/com.persistant-studios.popcornfx.urp/Documentation~/popcornfx.urp.md b/com.persistant-studios.popcornfx.urp/Documentation~/popcornfx.urp.md index 0af10f08..b8cf57c9 100644 --- a/com.persistant-studios.popcornfx.urp/Documentation~/popcornfx.urp.md +++ b/com.persistant-studios.popcornfx.urp/Documentation~/popcornfx.urp.md @@ -1,6 +1,6 @@ # Unity PopcornFX Plugin Integrates the **PopcornFX Runtime SDK** into **Unity** as a Plugin. -* **Version:** `v2.15.16` +* **Version:** `v2.15.17` * **Unity:** `2017.4` to `2021.x` * **Platforms:** `Windows`, `Linux`, `MacOS`, `iOS`, `Android`, `PS4`, `XboxOne`, `Switch`. [Contact-us](http://www.popcornfx.com/contact-us/) for more information. diff --git a/com.persistant-studios.popcornfx.urp/README.md b/com.persistant-studios.popcornfx.urp/README.md index 147ee9b4..c4ca999c 100644 --- a/com.persistant-studios.popcornfx.urp/README.md +++ b/com.persistant-studios.popcornfx.urp/README.md @@ -1,7 +1,7 @@ # Unity PopcornFX Plugin Integrates the **PopcornFX Runtime SDK** into **Unity** as a Plugin. -* **Version:** `v2.15.16` +* **Version:** `v2.15.17` * **Unity:** `2019.4` to `2022.x` * **Platforms:** `Windows`, `Linux`, `MacOS`, `iOS`, `Android`, `PS4`, `XboxOne`, `Switch`. [Contact-us](https://www.popcornfx.com/contact-popcornfx/) to request access to the plugin for consoles. diff --git a/com.persistant-studios.popcornfx.urp/Runtime/Assets/URP_CPUParticle_LitTransparent.asset b/com.persistant-studios.popcornfx.urp/Runtime/Assets/URP_CPUParticle_LitTransparent.asset index c3b49ea7..75a5f45f 100644 --- a/com.persistant-studios.popcornfx.urp/Runtime/Assets/URP_CPUParticle_LitTransparent.asset +++ b/com.persistant-studios.popcornfx.urp/Runtime/Assets/URP_CPUParticle_LitTransparent.asset @@ -70,6 +70,6 @@ MonoBehaviour: m_Material: {fileID: 0} m_RenderTypes: 01010001 m_BlendMode: 010101010000 - m_SupportedShaderMask: 4194302 + m_SupportedShaderMask: 4194238 m_MandatoryShaderMask: 8 m_BillboardingLocation: 0 diff --git a/com.persistant-studios.popcornfx.urp/Runtime/Assets/URP_CPUParticle_UnlitTransparent.asset b/com.persistant-studios.popcornfx.urp/Runtime/Assets/URP_CPUParticle_UnlitTransparent.asset index 54555357..98b0673a 100644 --- a/com.persistant-studios.popcornfx.urp/Runtime/Assets/URP_CPUParticle_UnlitTransparent.asset +++ b/com.persistant-studios.popcornfx.urp/Runtime/Assets/URP_CPUParticle_UnlitTransparent.asset @@ -70,6 +70,6 @@ MonoBehaviour: m_Material: {fileID: 0} m_RenderTypes: 01010001 m_BlendMode: 010101010000 - m_SupportedShaderMask: 4194294 + m_SupportedShaderMask: 4194230 m_MandatoryShaderMask: 0 m_BillboardingLocation: 0 diff --git a/com.persistant-studios.popcornfx.urp/Runtime/Assets/URP_CPURibbonCorrectDeformation_LitTransparent.asset b/com.persistant-studios.popcornfx.urp/Runtime/Assets/URP_CPURibbonCorrectDeformation_LitTransparent.asset index 97db5070..5a27388c 100644 --- a/com.persistant-studios.popcornfx.urp/Runtime/Assets/URP_CPURibbonCorrectDeformation_LitTransparent.asset +++ b/com.persistant-studios.popcornfx.urp/Runtime/Assets/URP_CPURibbonCorrectDeformation_LitTransparent.asset @@ -70,6 +70,6 @@ MonoBehaviour: m_Material: {fileID: 0} m_RenderTypes: 00010000 m_BlendMode: 010101010000 - m_SupportedShaderMask: 4194301 + m_SupportedShaderMask: 4194237 m_MandatoryShaderMask: 9 m_BillboardingLocation: 0 diff --git a/com.persistant-studios.popcornfx.urp/Runtime/Assets/URP_CPURibbonCorrectDeformation_UnlitTransparent.asset b/com.persistant-studios.popcornfx.urp/Runtime/Assets/URP_CPURibbonCorrectDeformation_UnlitTransparent.asset index 4b9d4ebd..0ed04778 100644 --- a/com.persistant-studios.popcornfx.urp/Runtime/Assets/URP_CPURibbonCorrectDeformation_UnlitTransparent.asset +++ b/com.persistant-studios.popcornfx.urp/Runtime/Assets/URP_CPURibbonCorrectDeformation_UnlitTransparent.asset @@ -70,6 +70,6 @@ MonoBehaviour: m_Material: {fileID: 0} m_RenderTypes: 00010000 m_BlendMode: 010101010000 - m_SupportedShaderMask: 4194293 + m_SupportedShaderMask: 4194229 m_MandatoryShaderMask: 1 m_BillboardingLocation: 0 diff --git a/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_LitOpaque.shadergraph b/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_LitOpaque.shadergraph index 6426c158..33d66de4 100644 --- a/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_LitOpaque.shadergraph +++ b/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_LitOpaque.shadergraph @@ -5508,8 +5508,8 @@ "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", "m_Precision": 0, - "overrideHLSLDeclaration": false, - "hlslDeclarationOverride": 0, + "overrideHLSLDeclaration": true, + "hlslDeclarationOverride": 3, "m_Hidden": false, "m_Value": 0.0, "m_FloatType": 0, diff --git a/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_LitOpaqueSkinned.shadergraph b/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_LitOpaqueSkinned.shadergraph index 0f0d9984..f4ba16b8 100644 --- a/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_LitOpaqueSkinned.shadergraph +++ b/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_LitOpaqueSkinned.shadergraph @@ -11727,8 +11727,8 @@ "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", "m_Precision": 0, - "overrideHLSLDeclaration": false, - "hlslDeclarationOverride": 0, + "overrideHLSLDeclaration": true, + "hlslDeclarationOverride": 3, "m_Hidden": false, "m_Value": 0.0, "m_FloatType": 0, diff --git a/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_LitTransparent.shadergraph b/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_LitTransparent.shadergraph index 739755fa..1e6b0f39 100644 --- a/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_LitTransparent.shadergraph +++ b/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_LitTransparent.shadergraph @@ -3800,8 +3800,8 @@ "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", "m_Precision": 0, - "overrideHLSLDeclaration": false, - "hlslDeclarationOverride": 0, + "overrideHLSLDeclaration": true, + "hlslDeclarationOverride": 3, "m_Hidden": false, "m_Value": 0.0, "m_FloatType": 0, diff --git a/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_UnlitOpaque.shadergraph b/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_UnlitOpaque.shadergraph index cc2b26c3..84d8785b 100644 --- a/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_UnlitOpaque.shadergraph +++ b/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_UnlitOpaque.shadergraph @@ -5518,8 +5518,8 @@ "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", "m_Precision": 0, - "overrideHLSLDeclaration": false, - "hlslDeclarationOverride": 0, + "overrideHLSLDeclaration": true, + "hlslDeclarationOverride": 3, "m_Hidden": false, "m_Value": 0.0, "m_FloatType": 0, diff --git a/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_UnlitTransparent.shadergraph b/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_UnlitTransparent.shadergraph index 8e8a9002..b5f68212 100644 --- a/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_UnlitTransparent.shadergraph +++ b/com.persistant-studios.popcornfx.urp/Runtime/Materials/URP_Mesh_UnlitTransparent.shadergraph @@ -3470,8 +3470,8 @@ "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", "m_Precision": 0, - "overrideHLSLDeclaration": false, - "hlslDeclarationOverride": 0, + "overrideHLSLDeclaration": true, + "hlslDeclarationOverride": 3, "m_Hidden": false, "m_Value": 0.0, "m_FloatType": 0, diff --git a/com.persistant-studios.popcornfx.urp/Runtime/Scripts/PKFxMaterialFactoryURP.cs b/com.persistant-studios.popcornfx.urp/Runtime/Scripts/PKFxMaterialFactoryURP.cs index cb55bff5..9cef4d82 100644 --- a/com.persistant-studios.popcornfx.urp/Runtime/Scripts/PKFxMaterialFactoryURP.cs +++ b/com.persistant-studios.popcornfx.urp/Runtime/Scripts/PKFxMaterialFactoryURP.cs @@ -156,8 +156,7 @@ public override Material ResolveParticleMaterial(SBatchDesc batchDesc, PKFxEffec Debug.LogError("[PopcornFX] Trying to resolve material from PKFxEffectAsset that is not holding materials"); if (material == null) return null; - if (batchDesc.m_Type != ERendererType.Mesh) - material.renderQueue = m_RenderQueue + batchDesc.m_DrawOrder; + material.renderQueue = m_RenderQueue + batchDesc.m_DrawOrder; return material; } } diff --git a/com.persistant-studios.popcornfx.urp/package.json b/com.persistant-studios.popcornfx.urp/package.json index 72eeb2f0..a682a9d0 100644 --- a/com.persistant-studios.popcornfx.urp/package.json +++ b/com.persistant-studios.popcornfx.urp/package.json @@ -1,13 +1,13 @@ { "name": "com.persistant-studios.popcornfx.urp", "description": "URP Materials for PopcornFX.", - "version": "2.15.16", + "version": "2.15.17", "unity": "2020.2", "unityRelease": "", "displayName": "PopcornFX URP", "dependencies": { "com.unity.render-pipelines.core": "10.2.2", "com.unity.render-pipelines.universal": "10.2.2", - "com.persistant-studios.popcornfx": "2.15.16" + "com.persistant-studios.popcornfx": "2.15.17" } } diff --git a/com.persistant-studios.popcornfx/Documentation~/popcornfx.md b/com.persistant-studios.popcornfx/Documentation~/popcornfx.md index 0af10f08..b8cf57c9 100644 --- a/com.persistant-studios.popcornfx/Documentation~/popcornfx.md +++ b/com.persistant-studios.popcornfx/Documentation~/popcornfx.md @@ -1,6 +1,6 @@ # Unity PopcornFX Plugin Integrates the **PopcornFX Runtime SDK** into **Unity** as a Plugin. -* **Version:** `v2.15.16` +* **Version:** `v2.15.17` * **Unity:** `2017.4` to `2021.x` * **Platforms:** `Windows`, `Linux`, `MacOS`, `iOS`, `Android`, `PS4`, `XboxOne`, `Switch`. [Contact-us](http://www.popcornfx.com/contact-us/) for more information. diff --git a/com.persistant-studios.popcornfx/Editor/Scripts/PKFxAssetEditor.cs b/com.persistant-studios.popcornfx/Editor/Scripts/PKFxAssetEditor.cs index faafde0a..bde7233a 100644 --- a/com.persistant-studios.popcornfx/Editor/Scripts/PKFxAssetEditor.cs +++ b/com.persistant-studios.popcornfx/Editor/Scripts/PKFxAssetEditor.cs @@ -85,9 +85,8 @@ public override void OnInspectorGUI() SerializedProperty rdrs = serializedObject.FindProperty("m_RendererDescs"); SerializedProperty mats = serializedObject.FindProperty("m_Materials"); SerializedProperty customMats = serializedObject.FindProperty("m_CustomMaterials"); + int rdrsListSize = rdrs.arraySize; - if (rdrsListSize > 0) - EditorGUILayout.LabelField("Renderers : "); // Upgrade if material wasn't set in import (2.12.7 ++) if (mats.arraySize < rdrsListSize) @@ -102,6 +101,20 @@ public override void OnInspectorGUI() serializedObject.ApplyModifiedProperties(); } + bool reimport = false; + + if (rdrsListSize > 0) + { + EditorGUILayout.BeginHorizontal(); + EditorGUILayout.LabelField("Renderers : "); + using (new EditorGUI.DisabledScope(Application.isPlaying)) + { + if (GUILayout.Button("Reimport Materials")) + reimport = true; + } + EditorGUILayout.EndHorizontal(); + } + GUIStyle alernatingColors = new GUIStyle(); Color backgroundColor = EditorGUIUtility.isProSkin ? new Color32(56, 56, 56, 255) : new Color32(194, 194, 194, 255); @@ -120,9 +133,9 @@ public override void OnInspectorGUI() if (field != null) { SerializedProperty matProp = mats.GetArrayElementAtIndex(renderers[i].MaterialIdx); - if (matProp.objectReferenceValue == null) + if (reimport || matProp.objectReferenceValue == null) { - Material mat = PKFxSettings.MaterialFactory.EditorResolveMaterial(renderers[i], asset, false); + Material mat = PKFxSettings.MaterialFactory.EditorResolveMaterial(renderers[i], asset, reimport, true, false); matProp.objectReferenceValue = mat; serializedObject.ApplyModifiedProperties(); } diff --git a/com.persistant-studios.popcornfx/Editor/Scripts/PKFxMenus.cs b/com.persistant-studios.popcornfx/Editor/Scripts/PKFxMenus.cs index a9cc92ff..d80733af 100644 --- a/com.persistant-studios.popcornfx/Editor/Scripts/PKFxMenus.cs +++ b/com.persistant-studios.popcornfx/Editor/Scripts/PKFxMenus.cs @@ -506,7 +506,7 @@ static void UpdatePKFxFXReferencesInScene() //---------------------------------------------------------------------------- - public static void CreatePKFxFXMaterialsIFN() + public static void CreatePKFxFXMaterialsIFN(bool reimport = false) { string[] pkfxEffectAssets = AssetDatabase.FindAssets("t:PKFxEffectAsset"); @@ -516,7 +516,7 @@ public static void CreatePKFxFXMaterialsIFN() PKFxEffectAsset asset = (PKFxEffectAsset)AssetDatabase.LoadAssetAtPath(AssetDatabase.GUIDToAssetPath(assetGUID), typeof(PKFxEffectAsset)); foreach (SBatchDesc batch in asset.m_RendererDescs) - asset.m_Materials[batch.MaterialIdx] = factory.EditorResolveMaterial(batch, asset); + asset.m_Materials[batch.MaterialIdx] = factory.EditorResolveMaterial(batch, asset, reimport, true); } AssetDatabase.SaveAssets(); } @@ -531,6 +531,59 @@ static void _CreatePKFxFXMaterialsIFN(MenuCommand menuCommand) //---------------------------------------------------------------------------- + [MenuItem("Assets/PopcornFX/Delete unused PKFxFX Materials")] + static void _DeleteUnusedPKFxFXMaterials(MenuCommand menuCommand) + { + string pkfxMaterialsFolder = "Assets/" + PKFxSettings.UnityPackFxPath + "/UnityMaterials/"; + string[] pkfxMaterialAssets = AssetDatabase.FindAssets("t:material", new string[] { pkfxMaterialsFolder }); + Dictionary isUsedPkfxMaterials = new Dictionary(); + + foreach (string matGUID in pkfxMaterialAssets) + { + string matName = AssetDatabase.GUIDToAssetPath(matGUID); + matName = matName.Remove(0, pkfxMaterialsFolder.Length - 1); // Remove pkfxMaterialsFolder + matName = matName.Remove(matName.Length - 4); // Remove ".mat" + isUsedPkfxMaterials.Add(matName, false); + } + + string[] pkfxEffectAssets = AssetDatabase.FindAssets("t:PKFxEffectAsset"); + PKFxMaterialFactory factory = PKFxSettings.MaterialFactory; + foreach (string assetGUID in pkfxEffectAssets) + { + PKFxEffectAsset asset = (PKFxEffectAsset)AssetDatabase.LoadAssetAtPath(AssetDatabase.GUIDToAssetPath(assetGUID), typeof(PKFxEffectAsset)); + + foreach (SBatchDesc batch in asset.m_RendererDescs) + { + string matName = factory.EditorResolveMaterialName(batch); + if (isUsedPkfxMaterials.ContainsKey(matName)) + isUsedPkfxMaterials[matName] = true; + } + } + + int deleteCount = 0; + + foreach (var isUsedMat in isUsedPkfxMaterials) + { + if (!isUsedMat.Value) + { + string materialPath = pkfxMaterialsFolder + isUsedMat.Key + ".mat"; + AssetDatabase.DeleteAsset(materialPath); + deleteCount++; + } + } + Debug.Log("[PopcornFX] " + deleteCount + " unused PKFx material deleted."); + } + + //---------------------------------------------------------------------------- + + [MenuItem("Assets/PopcornFX/Reimport PKFxFX Materials")] + static void _ReimportKFxFXMaterials(MenuCommand menuCommand) + { + CreatePKFxFXMaterialsIFN(true); + } + + //---------------------------------------------------------------------------- + [MenuItem("Assets/PopcornFX/Log PKFxFX References")] static void LogPKFxFXReferences(MenuCommand menuCommand) { diff --git a/com.persistant-studios.popcornfx/README.md b/com.persistant-studios.popcornfx/README.md index 147ee9b4..c4ca999c 100644 --- a/com.persistant-studios.popcornfx/README.md +++ b/com.persistant-studios.popcornfx/README.md @@ -1,7 +1,7 @@ # Unity PopcornFX Plugin Integrates the **PopcornFX Runtime SDK** into **Unity** as a Plugin. -* **Version:** `v2.15.16` +* **Version:** `v2.15.17` * **Unity:** `2019.4` to `2022.x` * **Platforms:** `Windows`, `Linux`, `MacOS`, `iOS`, `Android`, `PS4`, `XboxOne`, `Switch`. [Contact-us](https://www.popcornfx.com/contact-popcornfx/) to request access to the plugin for consoles. diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/ARM64.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/ARM64.meta index d7f56c30..c5436a14 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/ARM64.meta +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/ARM64.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 99c2d7e9873c45129ca75fd026d4c01e +guid: 889cb98577c24434aa553651153bd382 folderAsset: yes DefaultImporter: diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/Android.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/Android.meta index 2453fb53..0dba346d 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/Android.meta +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/Android.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e94e03c7685c4130baf6a4ea7477a799 +guid: 9d3d63d74ff9429fb2137cb467401c93 folderAsset: yes DefaultImporter: diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/Android/libPK-UnityPlugin.so b/com.persistant-studios.popcornfx/Runtime/Plugins/Android/libPK-UnityPlugin.so index dfdf557a..156ba4d9 100755 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/Android/libPK-UnityPlugin.so +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/Android/libPK-UnityPlugin.so @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b2340cb5967f17cbedbe29ffdf69ccca764bca65e15e47cad1acb2dd491e2598 -size 4524828 +oid sha256:ce45626ba0b364b2b60feaa26ed6076f230f05670723be9617dc0856c086e0e4 +size 166884436 diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/Android/libPK-UnityPlugin.so.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/Android/libPK-UnityPlugin.so.meta index da6b7c1f..63ce3f4d 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/Android/libPK-UnityPlugin.so.meta +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/Android/libPK-UnityPlugin.so.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 976785334cbc446ebe35dd544374d529 +guid: 69c2198b1d8c40a5a6e88cdb6c1781a2 PluginImporter: serializedVersion: 2 isPreloaded: 0 diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/Android64.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/Android64.meta index 1a6648e6..ef92b51f 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/Android64.meta +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/Android64.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 76de2ab0dddc406a90da9c4cf7d0e5cd +guid: 66c6e1f0a907472883acef07aead8b04 folderAsset: yes DefaultImporter: diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/Android64/libPK-UnityPlugin.so b/com.persistant-studios.popcornfx/Runtime/Plugins/Android64/libPK-UnityPlugin.so index 87469c01..bd4dd271 100755 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/Android64/libPK-UnityPlugin.so +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/Android64/libPK-UnityPlugin.so @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3101e1d995a9f107cd75325a967f5dc47de5aa723ab6db9154c5891d64d4521c -size 4159288 +oid sha256:22c38b92da75373d3af971f22940841a41fee75c799fe484debee081d31af9b3 +size 128102632 diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/Android64/libPK-UnityPlugin.so.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/Android64/libPK-UnityPlugin.so.meta index 665e8439..a0303349 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/Android64/libPK-UnityPlugin.so.meta +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/Android64/libPK-UnityPlugin.so.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b7d0ba97806446ad90cd70a8b1c09bc9 +guid: 9beb0505ce6749cd85943079f15003ff PluginImporter: serializedVersion: 2 isPreloaded: 0 diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/OSX.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/OSX.meta index 527fc910..8e753e3d 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/OSX.meta +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/OSX.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9fb85a9b0a674d9da33be0a339af55cf +guid: 5d774986a28a4a2b8f3fc8e11ce6a226 folderAsset: yes DefaultImporter: diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/OSX/libPK-UnityPlugin.dylib b/com.persistant-studios.popcornfx/Runtime/Plugins/OSX/libPK-UnityPlugin.dylib index 1aff2e2d..e9b124d6 100755 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/OSX/libPK-UnityPlugin.dylib +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/OSX/libPK-UnityPlugin.dylib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec55469db61af7c2a94da578c30bdd55abb38f68aa62252403e18e3aea13ba0e -size 64571873 +oid sha256:56dc6b4e7221086ddbf7d25ed8a83f1e48fb67ff80e99095bad5d0acbd8c2310 +size 64572753 diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/OSX/libPK-UnityPlugin.dylib.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/OSX/libPK-UnityPlugin.dylib.meta index f702d4b1..dc4ceb91 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/OSX/libPK-UnityPlugin.dylib.meta +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/OSX/libPK-UnityPlugin.dylib.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4863991580194cc19fe4f97e1e1ec7b7 +guid: 253fa0f62e5f45278cf8038dd02800da PluginImporter: serializedVersion: 2 isPreloaded: 0 diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/iOS.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/iOS.meta index 60b7a918..ccb61209 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/iOS.meta +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/iOS.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 669706f3c74548c48251e499889eedf3 +guid: 353f70c84c2f4839a55cfb3e26241280 folderAsset: yes DefaultImporter: diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/ios.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/ios.meta index e0d8b8d9..2a1f9a1c 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/ios.meta +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/ios.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6cdbb84bd13c4c868c45032b917eb373 +guid: ceff43bdd6b24e33b0ea479c8f7144ff folderAsset: yes DefaultImporter: diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/ios64.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/ios64.meta index 56ea90e3..7a8828a5 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/ios64.meta +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/ios64.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 15b97672943d4f0e8fad599abeeaba09 +guid: bb33033ef342488ca197d8f821841301 folderAsset: yes DefaultImporter: diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/libPK-UnityPlugin.a b/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/libPK-UnityPlugin.a index ddf135c0..31c5a90e 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/libPK-UnityPlugin.a +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/libPK-UnityPlugin.a @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a7adb67e7bed3c7055b6ce47874948d758f22948d48ba090cca7cf9a2ef73bc6 -size 356759640 +oid sha256:1f5cdb00490476988d89857f0ff7ffc8e5525e991db3a57ec093e750ab9ecf1a +size 356788496 diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/libPK-UnityPlugin.a.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/libPK-UnityPlugin.a.meta index d181e431..1822c9b0 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/libPK-UnityPlugin.a.meta +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/iOS/libPK-UnityPlugin.a.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2b967ea4c02646c5ae2cd7b89c2c59ae +guid: 834a452946994b328ed571a788963e72 PluginImporter: serializedVersion: 2 isPreloaded: 0 diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/x86.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/x86.meta index 969d97e6..c286b91d 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/x86.meta +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/x86.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e0465838df4b42ffacaf1b308516c818 +guid: d402379ee1c14978849cc1e5c0605fef folderAsset: yes DefaultImporter: diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/x86/PK-UnityPlugin.dll b/com.persistant-studios.popcornfx/Runtime/Plugins/x86/PK-UnityPlugin.dll index 85fee963..2024eb0d 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/x86/PK-UnityPlugin.dll +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/x86/PK-UnityPlugin.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74a39834505c18c424fe66c3a4c449bf59b7f01327255079ae6cd5c6db3801cb -size 4037120 +oid sha256:d8287590e55e0a1bc61140ee148c594df2eb201de650fbb6b837876226c31c7d +size 4030976 diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/x86/PK-UnityPlugin.dll.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/x86/PK-UnityPlugin.dll.meta index 7974b565..6de7f6bd 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/x86/PK-UnityPlugin.dll.meta +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/x86/PK-UnityPlugin.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ff06f32aafad4bfc8567a09ca988e1ed +guid: 273068e5ab5d4357ad93a6dc0f82441a PluginImporter: serializedVersion: 2 isPreloaded: 0 diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64.meta index 8ff6b867..10c29a80 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64.meta +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 054038d2fbb8458ebbe60d4ba6ca502a +guid: 22b5c42b8139413fa0582c778814f077 folderAsset: yes DefaultImporter: diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/PK-UnityPlugin.dll b/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/PK-UnityPlugin.dll index 7b84238b..f811d513 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/PK-UnityPlugin.dll +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/PK-UnityPlugin.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ecc91186946b84c70a6ea5630a021a2f05fe25bf3fa8dfae437322d51d129a12 -size 22467584 +oid sha256:a0142e8deeec2d9c36a018973b87e1fdd9fea2c4be9e143e39d242bc837e5b07 +size 22480384 diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/PK-UnityPlugin.dll.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/PK-UnityPlugin.dll.meta index 96b52811..0bb46cf9 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/PK-UnityPlugin.dll.meta +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/PK-UnityPlugin.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cb09a6b4654e4a59ac5b7f1d31984f86 +guid: 48fe010c40514d1a8451fa16b62ebcd1 PluginImporter: serializedVersion: 2 isPreloaded: 0 diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/libPK-UnityPlugin.so b/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/libPK-UnityPlugin.so index 2be3687e..d02d6895 100755 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/libPK-UnityPlugin.so +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/libPK-UnityPlugin.so @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ecc836adac64d7f306bd1397665832d10e5e7f454905ae30c44b8b50efe96a45 -size 19979456 +oid sha256:543d741ecaea6d1e4c4a9c4224e7a34a706b2d53df957ebc8b80d9e6e80b474c +size 19983552 diff --git a/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/libPK-UnityPlugin.so.meta b/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/libPK-UnityPlugin.so.meta index fc0b9e65..ccdffb15 100644 --- a/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/libPK-UnityPlugin.so.meta +++ b/com.persistant-studios.popcornfx/Runtime/Plugins/x86_64/libPK-UnityPlugin.so.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dc47c04fe09b47e5b69d2af67efae5fc +guid: 0e43c27c5ea54d61a997cdc3c06520d0 PluginImporter: serializedVersion: 2 isPreloaded: 0 diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxCamera.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxCamera.cs index a7814038..2c61e901 100644 --- a/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxCamera.cs +++ b/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxCamera.cs @@ -57,9 +57,8 @@ public int RenderPass bool SetupDistortionPassIFN() { - if (GraphicsSettings.renderPipelineAsset != null && - (GraphicsSettings.renderPipelineAsset.name == "HDRenderPipelineAsset" || - GraphicsSettings.renderPipelineAsset.name == "UniversalRenderPipelineAsset")) + if (PKFxSettings.MaterialFactory.m_FactoryType == PKFxMaterialFactory.FactoryType.URP || + PKFxSettings.MaterialFactory.m_FactoryType == PKFxMaterialFactory.FactoryType.HDRP) return false; // HDRP, we are using distortion builtin shaders // URP, Distortion is handled as forward rendering if (PKFxSettings.EnableSoftParticles == false) @@ -193,13 +192,11 @@ internal void SetCullingMask(short ID, LayerMask targetMask, LayerMask allPKMask if (PKFxSettings.EnableDistortion) { - if (GraphicsSettings.renderPipelineAsset == null || - !(GraphicsSettings.renderPipelineAsset.name == "HDRenderPipelineAsset" || - GraphicsSettings.renderPipelineAsset.name == "UniversalRenderPipelineAsset")) + if (PKFxSettings.MaterialFactory.m_FactoryType != PKFxMaterialFactory.FactoryType.URP && + PKFxSettings.MaterialFactory.m_FactoryType != PKFxMaterialFactory.FactoryType.HDRP) { // We disable the rendering of the distortion objects, this is going to be handled in a command buffer: m_Camera.cullingMask &= ~(1 << LayerMask.NameToLayer(PKFxManagerImpl.m_DistortionLayer)); - } else m_Camera.cullingMask |= 1 << LayerMask.NameToLayer(PKFxManagerImpl.m_DistortionLayer); diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxLogger.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxLogger.cs index eb22e346..433f373c 100644 --- a/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxLogger.cs +++ b/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxLogger.cs @@ -24,7 +24,7 @@ public static void LogUpdate(PKFxManager.EPopcornLogLevels minimumLogLevel) if (minimumLogLevel == PKFxManager.EPopcornLogLevels.Level_None) return; - while (PKFxManager.GetPopcornFXLog(ref currentLog, ref level) >= 0) + while (PKFxManager.GetPopcornFXLogNumber() > 0 && PKFxManager.GetPopcornFXLog(ref currentLog, ref level) >= 0) { if ((int)level < (int)minimumLogLevel) continue; diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxRenderingPlugin.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxRenderingPlugin.cs index 662326ec..44cf358c 100644 --- a/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxRenderingPlugin.cs +++ b/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxRenderingPlugin.cs @@ -140,6 +140,8 @@ public void UpdateSimulation() void Update() { + if (PKFxManager.CanSkipUpdate()) + return; for (int i = 0; i < m_Cameras.Count; ++i) { if (i < MaxCameraSupport()) @@ -162,8 +164,9 @@ private void LateUpdate() void _LateUpdate() { + if (PKFxManager.CanSkipUpdate()) + return; PKFxManager.UpdateParticles(); - for (int i = 0; i < m_Cameras.Count; ++i) { if (i < MaxCameraSupport()) diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxManagedToNative.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxManagedToNative.cs index 66cdb087..ad32abe4 100644 --- a/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxManagedToNative.cs +++ b/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxManagedToNative.cs @@ -200,6 +200,8 @@ internal partial class PKFxManagerImpl : object [DllImport(kPopcornPluginName, CallingConvention = kCallingConvention)] public static extern int UnstackLog(StringBuilder dstBuffer, int dstSize, ref int logSeverity); [DllImport(kPopcornPluginName, CallingConvention = kCallingConvention)] + public static extern int GetStackLogNumber(); + [DllImport(kPopcornPluginName, CallingConvention = kCallingConvention)] public static extern void SetMaxCameraCount(int number); [DllImport(kPopcornPluginName, CallingConvention = kCallingConvention)] public static extern void UpdateCamDesc(int camID, ref SCamDesc desc, bool update); @@ -306,6 +308,9 @@ internal partial class PKFxManagerImpl : object [DllImport(kPopcornPluginName, CallingConvention = kCallingConvention)] public static extern bool StatsPullFrameData(string reportName, ref SStatsToFill data); + [DllImport(kPopcornPluginName, CallingConvention = kCallingConvention)] + public static extern bool CanSkipUpdate(); + #if UNITY_EDITOR [DllImport(kPopcornPluginName, CallingConvention = kCallingConvention)] public static extern bool PopcornFXEditorStartup(); @@ -352,7 +357,7 @@ internal partial class PKFxManagerImpl : object //---------------------------------------------------------------------------- private const string m_UnityVersion = "Unity 2019.4 and up"; - public const string m_PluginVersion = "2.15.16 for " + m_UnityVersion; + public const string m_PluginVersion = "2.15.17 for " + m_UnityVersion; public static string m_CurrentVersionString = ""; public static bool m_IsStarted = false; public static string m_DistortionLayer = "PopcornFX_Disto"; diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxNativeToManaged.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxNativeToManaged.cs index 9baf8344..b1140248 100644 --- a/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxNativeToManaged.cs +++ b/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxNativeToManaged.cs @@ -159,6 +159,8 @@ public struct SMeshRendererDesc public int m_TextureAtlasCount; public IntPtr m_TextureAtlas; + + public int m_DrawOrder; }; @@ -1082,7 +1084,14 @@ private static bool ResizeParticleMeshBuffer(Mesh mesh, renderer.m_IndexCount = (int)reservedIndexCount; mesh.subMeshCount = 1; - mesh.SetSubMesh(0, new SubMeshDescriptor(0, (int)reservedIndexCount), MeshUpdateFlags.DontRecalculateBounds); + SubMeshDescriptor desc = new SubMeshDescriptor(); + desc.topology = MeshTopology.Triangles; + desc.firstVertex = 0; + desc.baseVertex = 0; + desc.indexStart = 0; + desc.vertexCount = renderer.m_VertexCount; + desc.indexCount = renderer.m_IndexCount; + mesh.SetSubMesh(0, desc, MeshUpdateFlags.DontRecalculateBounds); hasBeenResized = true; } diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxEffectAsset.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxEffectAsset.cs index fef88923..8fb42f81 100644 --- a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxEffectAsset.cs +++ b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxEffectAsset.cs @@ -341,7 +341,7 @@ public void ResetAllCustomMaterials(SerializedProperty mats, SerializedProperty { if (desc.MaterialIdx == info.m_InternalId) { - m_Materials[info.m_InternalId] = PKFxSettings.MaterialFactory.EditorGetDefaultMaterial(desc, this); + m_Materials[info.m_InternalId] = PKFxSettings.MaterialFactory.EditorResolveMaterial(desc, this); AssetDatabase.RemoveObjectFromAsset(info); mats.GetArrayElementAtIndex(info.m_InternalId).objectReferenceValue = PKFxSettings.MaterialFactory.EditorResolveMaterial(desc, this); break; diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxShaderInputBindings.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxShaderInputBindings.cs index 077beadb..f259d819 100644 --- a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxShaderInputBindings.cs +++ b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxShaderInputBindings.cs @@ -102,16 +102,21 @@ public void BindMaterialProperties(SBatchDesc batchDesc, Material material, PKFx int dstMode = 0; UnityBlendMode blend = UnityBlendMode.Alpha; // Additive and distortion - if (batchDesc.HasShaderVariationFlag(EShaderVariationFlags.Has_DistortionMap) || - batchDesc.m_BlendMode == EBlendMode.Additive) + if (batchDesc.HasShaderVariationFlag(EShaderVariationFlags.Has_DistortionMap)) { blend = UnityBlendMode.Additive; srcMode = (int)UnityEngine.Rendering.BlendMode.SrcAlpha; - if (GraphicsSettings.renderPipelineAsset != null && GraphicsSettings.renderPipelineAsset.name == "UniversalRenderPipelineAsset") + if (PKFxSettings.MaterialFactory.m_FactoryType == PKFxMaterialFactory.FactoryType.URP) dstMode = (int)UnityEngine.Rendering.BlendMode.OneMinusSrcAlpha; else dstMode = (int)UnityEngine.Rendering.BlendMode.One; } + else if (batchDesc.m_BlendMode == EBlendMode.Additive) + { + blend = UnityBlendMode.Additive; + srcMode = (int)UnityEngine.Rendering.BlendMode.SrcAlpha; + dstMode = (int)UnityEngine.Rendering.BlendMode.One; + } else if (batchDesc.m_BlendMode == EBlendMode.AdditiveNoAlpha) { blend = UnityBlendMode.Additive; @@ -137,6 +142,10 @@ public void BindMaterialProperties(SBatchDesc batchDesc, Material material, PKFx dstMode = (int)UnityEngine.Rendering.BlendMode.One; } + if (batchDesc.m_DrawOrder != 0 && PKFxSettings.MaterialFactory.m_FactoryType == PKFxMaterialFactory.FactoryType.URP) + { + material.SetFloat("_QueueOffset", batchDesc.m_DrawOrder); + } if (!string.IsNullOrEmpty(m_SourceBlendPropertyName)) { material.SetInt(m_SourceBlendPropertyName, srcMode); diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxManager.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxManager.cs index 73607f16..4d40722e 100644 --- a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxManager.cs +++ b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxManager.cs @@ -81,6 +81,14 @@ public static void SetMaxLogsPerFrame(int maxLogs) PKFxManagerImpl.SetMaxLogStack(maxLogs); } + public static int GetPopcornFXLogNumber() + { + if (!PKFxManagerImpl._IsDllLoaded()) + return 0; + + return PKFxManagerImpl.GetStackLogNumber(); + } + public static int GetPopcornFXLog(ref string log, ref EPopcornLogLevels level) { if (!PKFxManagerImpl._IsDllLoaded()) @@ -649,5 +657,11 @@ public static void DrawMeshRenderers() renderer.m_InstancesRenderer.DrawMeshes(); } } + + public static bool CanSkipUpdate() + { + return PKFxManagerImpl.CanSkipUpdate(); + } + } } \ No newline at end of file diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxMaterialFactory.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxMaterialFactory.cs index 2005adee..cb6a9067 100644 --- a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxMaterialFactory.cs +++ b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxMaterialFactory.cs @@ -101,10 +101,27 @@ public static string GetSelectedPathOrFallback() return path; } - public virtual Material EditorGetDefaultMaterial(SBatchDesc batchDesc, PKFxEffectAsset asset = null, bool logError = true) + public string EditorResolveMaterialName(SBatchDesc batchDesc) { + if (PKFxSettings.UseHashesAsMaterialName) + { + Hash128 hash = new Hash128(); + hash.Append(batchDesc.m_GeneratedName); + return hash.ToString(); + } + else + return batchDesc.GenerateShortNameFromDescription(); + } + + public Material EditorResolveMaterial(SBatchDesc batchDesc, PKFxEffectAsset asset = null, bool reimport = false, bool resolveCustomMat = false, bool logError = true) + { + if (!AssetDatabase.IsValidFolder("Assets" + PKFxSettings.UnityPackFxPath)) + AssetDatabase.CreateFolder("Assets", PKFxSettings.UnityPackFxPath.Substring(1)); + if (!AssetDatabase.IsValidFolder("Assets" + PKFxSettings.UnityPackFxPath + "/UnityMaterials")) + AssetDatabase.CreateFolder("Assets" + PKFxSettings.UnityPackFxPath, "UnityMaterials"); + PKFxRenderFeatureBinding binding = ResolveBatchBinding(batchDesc); - Material material; + Material material = null; if (binding == null) { @@ -112,17 +129,15 @@ public virtual Material EditorGetDefaultMaterial(SBatchDesc batchDesc, PKFxEffec return null; } - string matName; - if (PKFxSettings.UseHashesAsMaterialName) + string matName = EditorResolveMaterialName(batchDesc); + string materialPath = "Assets/" + PKFxSettings.UnityPackFxPath + "/UnityMaterials/" + matName + ".mat"; + Material assetMat = (Material)AssetDatabase.LoadAssetAtPath(materialPath, typeof(Material)); + + if (reimport && assetMat != null) { - Hash128 hash = new Hash128(); - hash.Append(batchDesc.m_GeneratedName); - matName = hash.ToString(); + assetMat = null; + AssetDatabase.DeleteAsset(materialPath); } - else - matName = batchDesc.GenerateShortNameFromDescription(); - - Material assetMat = (Material)AssetDatabase.LoadAssetAtPath("Assets/" + PKFxSettings.UnityPackFxPath + "/UnityMaterials/" + matName + ".mat", typeof(Material)); if (assetMat == null) { material = new Material(binding.m_Shader); @@ -133,20 +148,16 @@ public virtual Material EditorGetDefaultMaterial(SBatchDesc batchDesc, PKFxEffec AssetDatabase.CreateAsset(material, "Assets" + PKFxSettings.UnityPackFxPath + "/UnityMaterials/" + matName + ".mat"); AssetDatabase.SaveAssets(); } - else + if (resolveCustomMat) + { + PKFxCustomMaterialInfo customMatInfo = asset.FindCustomMaterialInfo(batchDesc); + if (customMatInfo != null) + material = customMatInfo.m_CustomMaterial; + } + if (material == null) material = assetMat; return material; } - - public virtual Material EditorResolveMaterial(SBatchDesc batchDesc, PKFxEffectAsset asset = null, bool logError = true) - { - if (!AssetDatabase.IsValidFolder("Assets" + PKFxSettings.UnityPackFxPath)) - AssetDatabase.CreateFolder("Assets", PKFxSettings.UnityPackFxPath.Substring(1)); - if (!AssetDatabase.IsValidFolder("Assets" + PKFxSettings.UnityPackFxPath + "/UnityMaterials")) - AssetDatabase.CreateFolder("Assets" + PKFxSettings.UnityPackFxPath, "UnityMaterials"); - - return EditorGetDefaultMaterial(batchDesc, asset, logError); - } #endif public PKFxRenderFeatureBinding ResolveBatchBinding(SBatchDesc batchDesc) diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxRendererDescription.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxRendererDescription.cs index a7da2e89..0b68a60a 100644 --- a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxRendererDescription.cs +++ b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxRendererDescription.cs @@ -455,6 +455,7 @@ public SBatchDesc(SMeshRendererDesc desc, int idx) m_Type = ERendererType.Mesh; m_ShaderVariationFlags = desc.m_ShaderVariationFlags; m_BlendMode = desc.m_BlendMode; + m_DrawOrder = desc.m_DrawOrder; m_RotateUVs = false; m_DiffuseMap = diffuseStr; m_DiffuseRampMap = diffuseRampStr; @@ -512,6 +513,7 @@ public SBatchDesc(SMeshRendererDesc desc, int idx) for (int i = 0; i < desc.m_TextureAtlasCount; ++i) { Vector4 curCol = subRects[i]; + curCol.w = 1 - curCol.y - curCol.w; // Unity sampling is reversed in Y. m_AtlasSubRects.SetPixel(i, 0, curCol); } } @@ -631,6 +633,7 @@ public string GenerateNameFromDescription() finalName += " "; finalName += m_DoubleSided ? "DoubleSided" : "OneSided"; } + finalName += " " + m_DrawOrder; return finalName; } public static string BlendModeToShortString(EBlendMode blendMode) @@ -693,7 +696,6 @@ public static string MaterialFlagsToShortString(int materialFlags) public string GenerateShortNameFromDescription() { - string finalName; if (m_Type == ERendererType.Billboard) diff --git a/com.persistant-studios.popcornfx/package.json b/com.persistant-studios.popcornfx/package.json index c1da1beb..958ef752 100644 --- a/com.persistant-studios.popcornfx/package.json +++ b/com.persistant-studios.popcornfx/package.json @@ -1,7 +1,7 @@ { "name": "com.persistant-studios.popcornfx", "description": "PopcornFX is a 3D realtime FX Solution for Games & Interactive applications.", - "version": "2.15.16", + "version": "2.15.17", "unity": "2019.3", "displayName": "PopcornFX" } diff --git a/download_3rd_party.bat b/download_3rd_party.bat index cdeb0184..f304815c 100644 --- a/download_3rd_party.bat +++ b/download_3rd_party.bat @@ -7,7 +7,7 @@ set OPEN_SOURCE_UNITY_REPO_PATH=%~dp0 bitsadmin /reset bitsadmin /create third_party_download -bitsadmin /addfile third_party_download http://downloads.popcornfx.com/Plugins/ExternalLibs/ExternalLibs_UnityStore_2.15.16-19154_android_android64_arm64_ios_ios64_x32_x64_android_ios_linux_macosx_vs2019.zip "%OPEN_SOURCE_UNITY_REPO_PATH%ExternalLibs.zip" +bitsadmin /addfile third_party_download http://downloads.popcornfx.com/Plugins/ExternalLibs/ExternalLibs_UnityStore_2.15.17-19546_android_android64_arm64_ios_ios64_x32_x64_android_ios_linux_macosx_vs2019.zip "%OPEN_SOURCE_UNITY_REPO_PATH%ExternalLibs.zip" bitsadmin /setpriority third_party_download "FOREGROUND" bitsadmin /resume third_party_download diff --git a/download_3rd_party.sh b/download_3rd_party.sh index 33a44f73..0f1f24c5 100644 --- a/download_3rd_party.sh +++ b/download_3rd_party.sh @@ -4,6 +4,6 @@ SCRIPT_PATH=$(readlink -f "$0") OPEN_SOURCE_UNITY_REPO_PATH=$(dirname "$SCRIPT_PATH") rm -rf "$OPEN_SOURCE_UNITY_REPO_PATH/ExternalLibs" -wget "http://downloads.popcornfx.com/Plugins/ExternalLibs/ExternalLibs_UnityStore_2.15.16-19154_android_android64_arm64_ios_ios64_x32_x64_android_ios_linux_macosx_vs2019.zip" -o "$OPEN_SOURCE_UNITY_REPO_PATH/ExternalLibs.zip" +wget "http://downloads.popcornfx.com/Plugins/ExternalLibs/ExternalLibs_UnityStore_2.15.17-19546_android_android64_arm64_ios_ios64_x32_x64_android_ios_linux_macosx_vs2019.zip" -o "$OPEN_SOURCE_UNITY_REPO_PATH/ExternalLibs.zip" unzip "$OPEN_SOURCE_UNITY_REPO_PATH/ExternalLibs.zip" rm -f "$OPEN_SOURCE_UNITY_REPO_PATH/ExternalLibs.zip" diff --git a/projects/UnityStore_android/PK-Discretizers.make b/projects/UnityStore_android/PK-Discretizers.make index f1834567..12ea58ad 100644 --- a/projects/UnityStore_android/PK-Discretizers.make +++ b/projects/UnityStore_android/PK-Discretizers.make @@ -40,13 +40,13 @@ endef ifeq ($(config),debug_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-Discretizers_d.a @@ -58,13 +58,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),debug_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-Discretizers_d.a @@ -76,13 +76,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-Discretizers_r.a @@ -94,13 +94,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-Discretizers_r.a @@ -112,13 +112,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),retail_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-Discretizers_s.a @@ -130,13 +130,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s else ifeq ($(config),retail_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-Discretizers_s.a diff --git a/projects/UnityStore_android/PK-ImporterLib.make b/projects/UnityStore_android/PK-ImporterLib.make index ee3af02d..82c96fd4 100644 --- a/projects/UnityStore_android/PK-ImporterLib.make +++ b/projects/UnityStore_android/PK-ImporterLib.make @@ -40,13 +40,13 @@ endef ifeq ($(config),debug_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-ImporterLib_d.a @@ -58,13 +58,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),debug_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-ImporterLib_d.a @@ -76,13 +76,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-ImporterLib_r.a @@ -94,13 +94,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-ImporterLib_r.a @@ -112,13 +112,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),retail_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-ImporterLib_s.a @@ -130,13 +130,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s else ifeq ($(config),retail_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-ImporterLib_s.a diff --git a/projects/UnityStore_android/PK-IntegrationUnity.make b/projects/UnityStore_android/PK-IntegrationUnity.make index a5e17f38..6e30945a 100644 --- a/projects/UnityStore_android/PK-IntegrationUnity.make +++ b/projects/UnityStore_android/PK-IntegrationUnity.make @@ -35,13 +35,13 @@ endef ifeq ($(config),debug_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../com.persistant-studios.popcornfx/Runtime/Plugins/Android TARGET = $(TARGETDIR)/libPK-UnityPlugin.so @@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),debug_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../com.persistant-studios.popcornfx/Runtime/Plugins/Android64 TARGET = $(TARGETDIR)/libPK-UnityPlugin.so @@ -75,13 +75,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),release_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../com.persistant-studios.popcornfx/Runtime/Plugins/Android TARGET = $(TARGETDIR)/libPK-UnityPlugin.so @@ -95,13 +95,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),release_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../com.persistant-studios.popcornfx/Runtime/Plugins/Android64 TARGET = $(TARGETDIR)/libPK-UnityPlugin.so diff --git a/projects/UnityStore_android/PK-ParticlesToolbox.make b/projects/UnityStore_android/PK-ParticlesToolbox.make index 84b7f72a..b3ad7ff7 100644 --- a/projects/UnityStore_android/PK-ParticlesToolbox.make +++ b/projects/UnityStore_android/PK-ParticlesToolbox.make @@ -40,13 +40,13 @@ endef ifeq ($(config),debug_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-ParticlesToolbox_d.a @@ -58,13 +58,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),debug_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-ParticlesToolbox_d.a @@ -76,13 +76,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-ParticlesToolbox_r.a @@ -94,13 +94,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-ParticlesToolbox_r.a @@ -112,13 +112,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),retail_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-ParticlesToolbox_s.a @@ -130,13 +130,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s else ifeq ($(config),retail_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-ParticlesToolbox_s.a diff --git a/projects/UnityStore_android/PK-Plugin_CodecImage_DDS.make b/projects/UnityStore_android/PK-Plugin_CodecImage_DDS.make index 123b6963..ec1e4310 100644 --- a/projects/UnityStore_android/PK-Plugin_CodecImage_DDS.make +++ b/projects/UnityStore_android/PK-Plugin_CodecImage_DDS.make @@ -37,13 +37,13 @@ endef ifeq ($(config),debug_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_DDS_d.a @@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),debug_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_DDS_d.a @@ -73,13 +73,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_DDS_r.a @@ -91,13 +91,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_DDS_r.a @@ -109,13 +109,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),retail_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_DDS_s.a @@ -127,13 +127,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s else ifeq ($(config),retail_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_DDS_s.a diff --git a/projects/UnityStore_android/PK-Plugin_CodecImage_EXR.make b/projects/UnityStore_android/PK-Plugin_CodecImage_EXR.make index 0fb1f498..f9abfd59 100644 --- a/projects/UnityStore_android/PK-Plugin_CodecImage_EXR.make +++ b/projects/UnityStore_android/PK-Plugin_CodecImage_EXR.make @@ -37,13 +37,13 @@ endef ifeq ($(config),debug_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_EXR_d.a @@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),debug_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_EXR_d.a @@ -73,13 +73,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_EXR_r.a @@ -91,13 +91,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_EXR_r.a @@ -109,13 +109,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),retail_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_EXR_s.a @@ -127,13 +127,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s else ifeq ($(config),retail_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_EXR_s.a diff --git a/projects/UnityStore_android/PK-Plugin_CodecImage_HDR.make b/projects/UnityStore_android/PK-Plugin_CodecImage_HDR.make index 74b37717..f7b2f9ec 100644 --- a/projects/UnityStore_android/PK-Plugin_CodecImage_HDR.make +++ b/projects/UnityStore_android/PK-Plugin_CodecImage_HDR.make @@ -37,13 +37,13 @@ endef ifeq ($(config),debug_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_HDR_d.a @@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),debug_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_HDR_d.a @@ -73,13 +73,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_HDR_r.a @@ -91,13 +91,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_HDR_r.a @@ -109,13 +109,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),retail_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_HDR_s.a @@ -127,13 +127,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s else ifeq ($(config),retail_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_HDR_s.a diff --git a/projects/UnityStore_android/PK-Plugin_CodecImage_JPG.make b/projects/UnityStore_android/PK-Plugin_CodecImage_JPG.make index 49394915..6323f0cc 100644 --- a/projects/UnityStore_android/PK-Plugin_CodecImage_JPG.make +++ b/projects/UnityStore_android/PK-Plugin_CodecImage_JPG.make @@ -37,13 +37,13 @@ endef ifeq ($(config),debug_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_JPG_d.a @@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),debug_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_JPG_d.a @@ -73,13 +73,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_JPG_r.a @@ -91,13 +91,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_JPG_r.a @@ -109,13 +109,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),retail_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_JPG_s.a @@ -127,13 +127,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s else ifeq ($(config),retail_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_JPG_s.a diff --git a/projects/UnityStore_android/PK-Plugin_CodecImage_PKM.make b/projects/UnityStore_android/PK-Plugin_CodecImage_PKM.make index f056d168..e2a44187 100644 --- a/projects/UnityStore_android/PK-Plugin_CodecImage_PKM.make +++ b/projects/UnityStore_android/PK-Plugin_CodecImage_PKM.make @@ -37,13 +37,13 @@ endef ifeq ($(config),debug_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PKM_d.a @@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),debug_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PKM_d.a @@ -73,13 +73,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PKM_r.a @@ -91,13 +91,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PKM_r.a @@ -109,13 +109,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),retail_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PKM_s.a @@ -127,13 +127,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s else ifeq ($(config),retail_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PKM_s.a diff --git a/projects/UnityStore_android/PK-Plugin_CodecImage_PNG.make b/projects/UnityStore_android/PK-Plugin_CodecImage_PNG.make index aa55a3eb..4f990464 100644 --- a/projects/UnityStore_android/PK-Plugin_CodecImage_PNG.make +++ b/projects/UnityStore_android/PK-Plugin_CodecImage_PNG.make @@ -37,13 +37,13 @@ endef ifeq ($(config),debug_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PNG_d.a @@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),debug_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PNG_d.a @@ -73,13 +73,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PNG_r.a @@ -91,13 +91,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PNG_r.a @@ -109,13 +109,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),retail_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PNG_s.a @@ -127,13 +127,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s else ifeq ($(config),retail_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PNG_s.a diff --git a/projects/UnityStore_android/PK-Plugin_CodecImage_PVR.make b/projects/UnityStore_android/PK-Plugin_CodecImage_PVR.make index e21183a8..e3f63b59 100644 --- a/projects/UnityStore_android/PK-Plugin_CodecImage_PVR.make +++ b/projects/UnityStore_android/PK-Plugin_CodecImage_PVR.make @@ -37,13 +37,13 @@ endef ifeq ($(config),debug_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PVR_d.a @@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),debug_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PVR_d.a @@ -73,13 +73,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PVR_r.a @@ -91,13 +91,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PVR_r.a @@ -109,13 +109,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),retail_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PVR_s.a @@ -127,13 +127,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s else ifeq ($(config),retail_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PVR_s.a diff --git a/projects/UnityStore_android/PK-Plugin_CodecImage_TGA.make b/projects/UnityStore_android/PK-Plugin_CodecImage_TGA.make index 4d66ede1..c95821a7 100644 --- a/projects/UnityStore_android/PK-Plugin_CodecImage_TGA.make +++ b/projects/UnityStore_android/PK-Plugin_CodecImage_TGA.make @@ -37,13 +37,13 @@ endef ifeq ($(config),debug_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_TGA_d.a @@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),debug_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_TGA_d.a @@ -73,13 +73,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_TGA_r.a @@ -91,13 +91,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_TGA_r.a @@ -109,13 +109,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),retail_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_TGA_s.a @@ -127,13 +127,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s else ifeq ($(config),retail_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_TGA_s.a diff --git a/projects/UnityStore_android/PK-Plugin_CompilerBackend_CPU_VM.make b/projects/UnityStore_android/PK-Plugin_CompilerBackend_CPU_VM.make index a1ee211a..6794d6ba 100644 --- a/projects/UnityStore_android/PK-Plugin_CompilerBackend_CPU_VM.make +++ b/projects/UnityStore_android/PK-Plugin_CompilerBackend_CPU_VM.make @@ -40,13 +40,13 @@ endef ifeq ($(config),debug_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-Plugin_CompilerBackend_CPU_VM_d.a @@ -58,13 +58,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),debug_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-Plugin_CompilerBackend_CPU_VM_d.a @@ -76,13 +76,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-Plugin_CompilerBackend_CPU_VM_r.a @@ -94,13 +94,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-Plugin_CompilerBackend_CPU_VM_r.a @@ -112,13 +112,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),retail_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-Plugin_CompilerBackend_CPU_VM_s.a @@ -130,13 +130,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s else ifeq ($(config),retail_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-Plugin_CompilerBackend_CPU_VM_s.a diff --git a/projects/UnityStore_android/PK-RHI.make b/projects/UnityStore_android/PK-RHI.make index eee26bbd..4177ef33 100644 --- a/projects/UnityStore_android/PK-RHI.make +++ b/projects/UnityStore_android/PK-RHI.make @@ -40,13 +40,13 @@ endef ifeq ($(config),debug_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-RHI_d.a @@ -58,13 +58,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),debug_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-RHI_d.a @@ -76,13 +76,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-RHI_r.a @@ -94,13 +94,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-RHI_r.a @@ -112,13 +112,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),retail_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-RHI_s.a @@ -130,13 +130,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s else ifeq ($(config),retail_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-RHI_s.a diff --git a/projects/UnityStore_android/PK-RenderHelpers.make b/projects/UnityStore_android/PK-RenderHelpers.make index 8d338eaf..9f0713cc 100644 --- a/projects/UnityStore_android/PK-RenderHelpers.make +++ b/projects/UnityStore_android/PK-RenderHelpers.make @@ -40,13 +40,13 @@ endef ifeq ($(config),debug_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-RenderHelpers_d.a @@ -58,13 +58,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),debug_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-RenderHelpers_d.a @@ -76,13 +76,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-RenderHelpers_r.a @@ -94,13 +94,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-RenderHelpers_r.a @@ -112,13 +112,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),retail_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-RenderHelpers_s.a @@ -130,13 +130,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s else ifeq ($(config),retail_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-RenderHelpers_s.a diff --git a/projects/UnityStore_android/PK-Runtime.make b/projects/UnityStore_android/PK-Runtime.make index 00d70fc4..42695bd7 100644 --- a/projects/UnityStore_android/PK-Runtime.make +++ b/projects/UnityStore_android/PK-Runtime.make @@ -39,13 +39,13 @@ endef ifeq ($(config),debug_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-Runtime_d.a @@ -58,13 +58,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),debug_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-Runtime_d.a @@ -77,13 +77,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-Runtime_r.a @@ -96,13 +96,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-Runtime_r.a @@ -115,13 +115,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),retail_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-Runtime_s.a @@ -134,13 +134,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s else ifeq ($(config),retail_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-Runtime_s.a diff --git a/projects/UnityStore_android/PK-SampleLib.make b/projects/UnityStore_android/PK-SampleLib.make index af3c7d99..4ee2e5ad 100644 --- a/projects/UnityStore_android/PK-SampleLib.make +++ b/projects/UnityStore_android/PK-SampleLib.make @@ -40,13 +40,13 @@ endef ifeq ($(config),debug_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-SampleLib_d.a @@ -58,13 +58,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),debug_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-SampleLib_d.a @@ -76,13 +76,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-SampleLib_r.a @@ -94,13 +94,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-SampleLib_r.a @@ -112,13 +112,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),retail_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-SampleLib_s.a @@ -130,13 +130,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s else ifeq ($(config),retail_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-SampleLib_s.a diff --git a/projects/UnityStore_android/PK-Sample_01_BasicStartup.make b/projects/UnityStore_android/PK-Sample_01_BasicStartup.make index b20bbe42..3365249f 100644 --- a/projects/UnityStore_android/PK-Sample_01_BasicStartup.make +++ b/projects/UnityStore_android/PK-Sample_01_BasicStartup.make @@ -35,13 +35,13 @@ endef ifeq ($(config),debug_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_01_BasicStartup_d @@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),debug_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_01_BasicStartup_d @@ -75,13 +75,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),release_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_01_BasicStartup_r @@ -95,13 +95,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),release_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_01_BasicStartup_r @@ -115,13 +115,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),retail_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_01_BasicStartup_s @@ -135,13 +135,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),retail_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_01_BasicStartup_s diff --git a/projects/UnityStore_android/PK-Sample_02_BasicEvolve.make b/projects/UnityStore_android/PK-Sample_02_BasicEvolve.make index 60125823..b10b813c 100644 --- a/projects/UnityStore_android/PK-Sample_02_BasicEvolve.make +++ b/projects/UnityStore_android/PK-Sample_02_BasicEvolve.make @@ -35,13 +35,13 @@ endef ifeq ($(config),debug_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_02_BasicEvolve_d @@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),debug_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_02_BasicEvolve_d @@ -75,13 +75,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),release_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_02_BasicEvolve_r @@ -95,13 +95,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),release_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_02_BasicEvolve_r @@ -115,13 +115,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),retail_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_02_BasicEvolve_s @@ -135,13 +135,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),retail_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_02_BasicEvolve_s diff --git a/projects/UnityStore_android/PK-Sample_02_FullIntegration.make b/projects/UnityStore_android/PK-Sample_02_FullIntegration.make index 76c00804..27631b30 100644 --- a/projects/UnityStore_android/PK-Sample_02_FullIntegration.make +++ b/projects/UnityStore_android/PK-Sample_02_FullIntegration.make @@ -35,13 +35,13 @@ endef ifeq ($(config),debug_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_02_FullIntegration_d @@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),debug_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_02_FullIntegration_d @@ -75,13 +75,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),release_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_02_FullIntegration_r @@ -95,13 +95,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),release_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_02_FullIntegration_r @@ -115,13 +115,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),retail_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_02_FullIntegration_s @@ -135,13 +135,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),retail_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_02_FullIntegration_s diff --git a/projects/UnityStore_android/PK-Sample_03_EngineHooks.make b/projects/UnityStore_android/PK-Sample_03_EngineHooks.make index 24e87b4f..5634659c 100644 --- a/projects/UnityStore_android/PK-Sample_03_EngineHooks.make +++ b/projects/UnityStore_android/PK-Sample_03_EngineHooks.make @@ -35,13 +35,13 @@ endef ifeq ($(config),debug_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_03_EngineHooks_d @@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),debug_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_03_EngineHooks_d @@ -75,13 +75,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),release_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_03_EngineHooks_r @@ -95,13 +95,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),release_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_03_EngineHooks_r @@ -115,13 +115,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),retail_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_03_EngineHooks_s @@ -135,13 +135,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),retail_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_03_EngineHooks_s diff --git a/projects/UnityStore_android/PK-Sample_04_EffectInterface.make b/projects/UnityStore_android/PK-Sample_04_EffectInterface.make index 099bdb2f..9380b858 100644 --- a/projects/UnityStore_android/PK-Sample_04_EffectInterface.make +++ b/projects/UnityStore_android/PK-Sample_04_EffectInterface.make @@ -35,13 +35,13 @@ endef ifeq ($(config),debug_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_04_EffectInterface_d @@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),debug_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_04_EffectInterface_d @@ -75,13 +75,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),release_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_04_EffectInterface_r @@ -95,13 +95,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),release_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_04_EffectInterface_r @@ -115,13 +115,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),retail_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_04_EffectInterface_s @@ -135,13 +135,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),retail_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_04_EffectInterface_s diff --git a/projects/UnityStore_android/PK-Sample_05_Stats.make b/projects/UnityStore_android/PK-Sample_05_Stats.make index 87ff916b..594c69a8 100644 --- a/projects/UnityStore_android/PK-Sample_05_Stats.make +++ b/projects/UnityStore_android/PK-Sample_05_Stats.make @@ -35,13 +35,13 @@ endef ifeq ($(config),debug_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_05_Stats_d @@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),debug_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_05_Stats_d @@ -75,13 +75,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),release_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_05_Stats_r @@ -95,13 +95,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),release_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_05_Stats_r @@ -115,13 +115,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),retail_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_05_Stats_s @@ -135,13 +135,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),retail_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_05_Stats_s diff --git a/projects/UnityStore_android/PK-Sample_06_SimInterface.make b/projects/UnityStore_android/PK-Sample_06_SimInterface.make index d9d0e312..dc52f6f4 100644 --- a/projects/UnityStore_android/PK-Sample_06_SimInterface.make +++ b/projects/UnityStore_android/PK-Sample_06_SimInterface.make @@ -35,13 +35,13 @@ endef ifeq ($(config),debug_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_06_SimInterface_d @@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),debug_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_06_SimInterface_d @@ -75,13 +75,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),release_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_06_SimInterface_r @@ -95,13 +95,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),release_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_06_SimInterface_r @@ -115,13 +115,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),retail_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_06_SimInterface_s @@ -135,13 +135,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),retail_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_06_SimInterface_s diff --git a/projects/UnityStore_android/PK-Sample_06_SimInterfaceGPU.make b/projects/UnityStore_android/PK-Sample_06_SimInterfaceGPU.make index 7583c08c..f90946da 100644 --- a/projects/UnityStore_android/PK-Sample_06_SimInterfaceGPU.make +++ b/projects/UnityStore_android/PK-Sample_06_SimInterfaceGPU.make @@ -35,13 +35,13 @@ endef ifeq ($(config),debug_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_06_SimInterfaceGPU_d @@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),debug_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_06_SimInterfaceGPU_d @@ -75,13 +75,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),release_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_06_SimInterfaceGPU_r @@ -95,13 +95,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),release_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_06_SimInterfaceGPU_r @@ -115,13 +115,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),retail_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_06_SimInterfaceGPU_s @@ -135,13 +135,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),retail_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_06_SimInterfaceGPU_s diff --git a/projects/UnityStore_android/PK-Sample_07_LOD.make b/projects/UnityStore_android/PK-Sample_07_LOD.make index 1ac6b720..695dad9d 100644 --- a/projects/UnityStore_android/PK-Sample_07_LOD.make +++ b/projects/UnityStore_android/PK-Sample_07_LOD.make @@ -35,13 +35,13 @@ endef ifeq ($(config),debug_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_07_LOD_d @@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),debug_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_07_LOD_d @@ -75,13 +75,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),release_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_07_LOD_r @@ -95,13 +95,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),release_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_07_LOD_r @@ -115,13 +115,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),retail_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_07_LOD_s @@ -135,13 +135,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),retail_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_07_LOD_s diff --git a/projects/UnityStore_android/PK-Sample_08_CustomCollision.make b/projects/UnityStore_android/PK-Sample_08_CustomCollision.make index 944b87b5..5c121bd5 100644 --- a/projects/UnityStore_android/PK-Sample_08_CustomCollision.make +++ b/projects/UnityStore_android/PK-Sample_08_CustomCollision.make @@ -35,13 +35,13 @@ endef ifeq ($(config),debug_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_08_CustomCollision_d @@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),debug_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_08_CustomCollision_d @@ -75,13 +75,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),release_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_08_CustomCollision_r @@ -95,13 +95,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),release_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_08_CustomCollision_r @@ -115,13 +115,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),retail_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_08_CustomCollision_s @@ -135,13 +135,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),retail_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_08_CustomCollision_s diff --git a/projects/UnityStore_android/PK-Sample_09_AsyncLoading.make b/projects/UnityStore_android/PK-Sample_09_AsyncLoading.make index 6e4e63ba..19388a0f 100644 --- a/projects/UnityStore_android/PK-Sample_09_AsyncLoading.make +++ b/projects/UnityStore_android/PK-Sample_09_AsyncLoading.make @@ -35,13 +35,13 @@ endef ifeq ($(config),debug_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_09_AsyncLoading_d @@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),debug_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_09_AsyncLoading_d @@ -75,13 +75,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),release_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_09_AsyncLoading_r @@ -95,13 +95,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),release_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_09_AsyncLoading_r @@ -115,13 +115,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),retail_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_09_AsyncLoading_s @@ -135,13 +135,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),retail_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_09_AsyncLoading_s diff --git a/projects/UnityStore_android/PK-Sample_10_AsyncRendering.make b/projects/UnityStore_android/PK-Sample_10_AsyncRendering.make index 33aa15b0..54837e59 100644 --- a/projects/UnityStore_android/PK-Sample_10_AsyncRendering.make +++ b/projects/UnityStore_android/PK-Sample_10_AsyncRendering.make @@ -35,13 +35,13 @@ endef ifeq ($(config),debug_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_10_AsyncRendering_d @@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),debug_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_10_AsyncRendering_d @@ -75,13 +75,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),release_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_10_AsyncRendering_r @@ -95,13 +95,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),release_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_10_AsyncRendering_r @@ -115,13 +115,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),retail_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_10_AsyncRendering_s @@ -135,13 +135,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),retail_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_10_AsyncRendering_s diff --git a/projects/UnityStore_android/PK-Sample_11_ThreadPool.make b/projects/UnityStore_android/PK-Sample_11_ThreadPool.make index a1e3a95d..9fffc4a6 100644 --- a/projects/UnityStore_android/PK-Sample_11_ThreadPool.make +++ b/projects/UnityStore_android/PK-Sample_11_ThreadPool.make @@ -35,13 +35,13 @@ endef ifeq ($(config),debug_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_11_ThreadPool_d @@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),debug_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_11_ThreadPool_d @@ -75,13 +75,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),release_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_11_ThreadPool_r @@ -95,13 +95,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),release_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_11_ThreadPool_r @@ -115,13 +115,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),retail_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_11_ThreadPool_s @@ -135,13 +135,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),retail_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_11_ThreadPool_s diff --git a/projects/UnityStore_android/PK-Sample_12_GBufferSampling.make b/projects/UnityStore_android/PK-Sample_12_GBufferSampling.make index 5146c9fb..e36cf734 100644 --- a/projects/UnityStore_android/PK-Sample_12_GBufferSampling.make +++ b/projects/UnityStore_android/PK-Sample_12_GBufferSampling.make @@ -35,13 +35,13 @@ endef ifeq ($(config),debug_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_12_GBufferSampling_d @@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),debug_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_12_GBufferSampling_d @@ -75,13 +75,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),release_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_12_GBufferSampling_r @@ -95,13 +95,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),release_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_12_GBufferSampling_r @@ -115,13 +115,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),retail_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android_Samples TARGET = $(TARGETDIR)/PK-Sample_12_GBufferSampling_s @@ -135,13 +135,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr else ifeq ($(config),retail_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../../release/builds/Android64_Samples TARGET = $(TARGETDIR)/PK-Sample_12_GBufferSampling_s diff --git a/projects/UnityStore_android/PK-UpgraderLib.make b/projects/UnityStore_android/PK-UpgraderLib.make index 68b370db..8c9caf0a 100644 --- a/projects/UnityStore_android/PK-UpgraderLib.make +++ b/projects/UnityStore_android/PK-UpgraderLib.make @@ -40,13 +40,13 @@ endef ifeq ($(config),debug_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-UpgraderLib_d.a @@ -58,13 +58,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),debug_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-UpgraderLib_d.a @@ -76,13 +76,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-UpgraderLib_r.a @@ -94,13 +94,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-UpgraderLib_r.a @@ -112,13 +112,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),retail_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-UpgraderLib_s.a @@ -130,13 +130,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s else ifeq ($(config),retail_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-UpgraderLib_s.a diff --git a/projects/UnityStore_android/PK-ZLib.make b/projects/UnityStore_android/PK-ZLib.make index 962dcfa4..740a2a1c 100644 --- a/projects/UnityStore_android/PK-ZLib.make +++ b/projects/UnityStore_android/PK-ZLib.make @@ -37,13 +37,13 @@ endef ifeq ($(config),debug_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-ZLib_d.a @@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),debug_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-ZLib_d.a @@ -73,13 +73,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-ZLib_r.a @@ -91,13 +91,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),release_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-ZLib_r.a @@ -109,13 +109,13 @@ ALL_LDFLAGS += $(LDFLAGS) else ifeq ($(config),retail_android) ifeq ($(origin CC), default) - CC = $(EASYPATH)/arm-linux-androideabi-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH)/arm-linux-androideabi-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH)/arm-linux-androideabi-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android TARGET = $(TARGETDIR)/libPK-ZLib_s.a @@ -127,13 +127,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s else ifeq ($(config),retail_android64) ifeq ($(origin CC), default) - CC = $(EASYPATH64)/aarch64-linux-android-clang + CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang endif ifeq ($(origin CXX), default) - CXX = $(EASYPATH64)/aarch64-linux-android-clang++ + CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++ endif ifeq ($(origin AR), default) - AR = $(EASYPATH64)/aarch64-linux-android-ar + AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar endif TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64 TARGET = $(TARGETDIR)/libPK-ZLib_s.a