diff --git a/android/build.gradle b/android/build.gradle index eb06cd47..556f4dd7 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,4 +1,10 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. +/** + * Copyright (C) 2016-2023 by Sascha Willems - www.saschawillems.de + * + * This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) + */ + +/** Top-level build file where you can add configuration options common to all sub-projects/modules */ buildscript { repositories { @@ -6,7 +12,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.0' + classpath 'com.android.tools.build:gradle:7.0.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -17,4 +23,12 @@ allprojects { google() jcenter() } +} + +ext { + minSdkVersion = 19 + targetSdkVersion = 26 + compileSdkVersion = 26 + shaderPath = '../../../shaders/' + assetPath = '../../../assets/' } \ No newline at end of file diff --git a/android/examples/_template/build.gradle b/android/examples/_template/build.gradle index 00188610..eefe2a55 100644 --- a/android/examples/_template/build.gradle +++ b/android/examples/_template/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.%PACKAGE_NAME%" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,7 +43,7 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } diff --git a/android/examples/bloom/build.gradle b/android/examples/bloom/build.gradle index a5cfcfb9..bed7c0c1 100644 --- a/android/examples/bloom/build.gradle +++ b/android/examples/bloom/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanBloom" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,37 +43,37 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/bloom' + from rootProject.ext.shaderPath +'glsl/bloom' into 'assets/shaders/glsl/bloom' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath +'models' into 'assets/models' include 'retroufo.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath +'models' into 'assets/models' include 'retroufo_glow.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath +'models' into 'assets/models' include 'cube.gltf' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'cubemap_space.ktx' } diff --git a/android/examples/computecloth/build.gradle b/android/examples/computecloth/build.gradle index 159714a8..80d95ddd 100644 --- a/android/examples/computecloth/build.gradle +++ b/android/examples/computecloth/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanComputecloth" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,25 +43,25 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/computecloth' + from rootProject.ext.shaderPath + 'glsl/computecloth' into 'assets/shaders/glsl/computecloth' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'sphere.gltf' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'vulkan_cloth_rgba.ktx' } diff --git a/android/examples/computecullandlod/build.gradle b/android/examples/computecullandlod/build.gradle index b7915ff6..62eed3b7 100644 --- a/android/examples/computecullandlod/build.gradle +++ b/android/examples/computecullandlod/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanComputecullandlod" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,19 +43,19 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/computecullandlod' + from rootProject.ext.shaderPath + 'glsl/computecullandlod' into 'assets/shaders/glsl/computecullandlod' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'suzanne_lods.gltf' } diff --git a/android/examples/computeheadless/build.gradle b/android/examples/computeheadless/build.gradle index 4fad6029..0e0536c8 100644 --- a/android/examples/computeheadless/build.gradle +++ b/android/examples/computeheadless/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanComputeheadless" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,13 +43,13 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/computeheadless' + from rootProject.ext.shaderPath + 'glsl/computeheadless' into 'assets/shaders/glsl/computeheadless' include '*.*' } diff --git a/android/examples/computenbody/build.gradle b/android/examples/computenbody/build.gradle index 626d7530..6593d39f 100644 --- a/android/examples/computenbody/build.gradle +++ b/android/examples/computenbody/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanComputenbody" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,25 +43,25 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/computenbody' + from rootProject.ext.shaderPath + 'glsl/computenbody' into 'assets/shaders/glsl/computenbody' include '*.*' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'particle01_rgba.ktx' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'particle_gradient_rgba.ktx' } diff --git a/android/examples/computeparticles/build.gradle b/android/examples/computeparticles/build.gradle index 202ba2d9..bec13209 100644 --- a/android/examples/computeparticles/build.gradle +++ b/android/examples/computeparticles/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanComputeparticles" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,25 +43,25 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/computeparticles' + from rootProject.ext.shaderPath + 'glsl/computeparticles' into 'assets/shaders/glsl/computeparticles' include '*.*' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'particle01_rgba.ktx' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'particle_gradient_rgba.ktx' } diff --git a/android/examples/computeraytracing/build.gradle b/android/examples/computeraytracing/build.gradle index e6d223a4..215ecfb9 100644 --- a/android/examples/computeraytracing/build.gradle +++ b/android/examples/computeraytracing/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanComputeRaytracing" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,13 +43,13 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/computeraytracing' + from rootProject.ext.shaderPath + 'glsl/computeraytracing' into 'assets/shaders/glsl/computeraytracing' include '*.*' } diff --git a/android/examples/computeshader/build.gradle b/android/examples/computeshader/build.gradle index a7a97cf5..50762a7c 100644 --- a/android/examples/computeshader/build.gradle +++ b/android/examples/computeshader/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanComputeshader" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,19 +43,19 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/computeshader' + from rootProject.ext.shaderPath + 'glsl/computeshader' into 'assets/shaders/glsl/computeshader' include '*.*' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'vulkan_11_rgba.ktx' } diff --git a/android/examples/conservativeraster/build.gradle b/android/examples/conservativeraster/build.gradle index 9b5b84db..9ba83feb 100644 --- a/android/examples/conservativeraster/build.gradle +++ b/android/examples/conservativeraster/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanConservativeraster" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,13 +43,13 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/conservativeraster' + from rootProject.ext.shaderPath + 'glsl/conservativeraster' into 'assets/shaders/glsl/conservativeraster' include '*.*' } diff --git a/android/examples/debugmarker/build.gradle b/android/examples/debugmarker/build.gradle index 182bfbc8..668c14e8 100644 --- a/android/examples/debugmarker/build.gradle +++ b/android/examples/debugmarker/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanDebugmarker" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,25 +43,25 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/debugmarker' + from rootProject.ext.shaderPath + 'glsl/debugmarker' into 'assets/shaders/glsl/debugmarker' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'treasure_smooth.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'treasure_glow.gltf' } diff --git a/android/examples/deferred/build.gradle b/android/examples/deferred/build.gradle index 9baf72cd..175cb767 100644 --- a/android/examples/deferred/build.gradle +++ b/android/examples/deferred/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanDeferred" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,37 +43,37 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/deferred' + from rootProject.ext.shaderPath + 'glsl/deferred' into 'assets/shaders/glsl/deferred' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'deferred_floor.gltf' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'stonefloor01_color_*.ktx' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'stonefloor01_normal_*.ktx' } copy { - from '../../../data/models/armor' + from rootProject.ext.assetPath + 'models/armor' into 'assets/models/armor' include '*.*' } diff --git a/android/examples/deferredmultisampling/build.gradle b/android/examples/deferredmultisampling/build.gradle index 0bf15381..64d98426 100644 --- a/android/examples/deferredmultisampling/build.gradle +++ b/android/examples/deferredmultisampling/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanDeferredmultisampling" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,37 +43,37 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/deferredmultisampling' + from rootProject.ext.shaderPath + 'glsl/deferredmultisampling' into 'assets/shaders/glsl/deferredmultisampling' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'deferred_box.gltf' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'stonefloor02_color_*.ktx' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'stonefloor02_normal_*.ktx' } copy { - from '../../../data/models/armor' + from rootProject.ext.assetPath + 'models/armor' into 'assets/models/armor' include '*.*' } diff --git a/android/examples/deferredshadows/build.gradle b/android/examples/deferredshadows/build.gradle index 0dc247ae..9a69fc4a 100644 --- a/android/examples/deferredshadows/build.gradle +++ b/android/examples/deferredshadows/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanDeferredshadows" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,37 +43,37 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/deferredshadows' + from rootProject.ext.shaderPath + 'glsl/deferredshadows' into 'assets/shaders/glsl/deferredshadows' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'deferred_box.gltf' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'stonefloor02_color_*.ktx' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'stonefloor02_normal_*.ktx' } copy { - from '../../../data/models/armor' + from rootProject.ext.assetPath + 'models/armor' into 'assets/models/armor' include '*.*' } diff --git a/android/examples/descriptorindexing/build.gradle b/android/examples/descriptorindexing/build.gradle index 882e7467..f61ed680 100644 --- a/android/examples/descriptorindexing/build.gradle +++ b/android/examples/descriptorindexing/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanDescriptorindexing" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,13 +43,13 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/descriptorindexing' + from rootProject.ext.shaderPath + 'glsl/descriptorindexing' into 'assets/shaders/glsl/descriptorindexing' include '*.*' } diff --git a/android/examples/descriptorsets/build.gradle b/android/examples/descriptorsets/build.gradle index ebd01a42..b40fabc7 100644 --- a/android/examples/descriptorsets/build.gradle +++ b/android/examples/descriptorsets/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanDescriptorsets" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,31 +43,31 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/descriptorsets' + from rootProject.ext.shaderPath + 'glsl/descriptorsets' into 'assets/shaders/glsl/descriptorsets' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'cube.gltf' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'crate01_color_height_rgba.ktx' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'crate02_color_height_rgba.ktx' } diff --git a/android/examples/displacement/build.gradle b/android/examples/displacement/build.gradle index e7ee1cda..65f92506 100644 --- a/android/examples/displacement/build.gradle +++ b/android/examples/displacement/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanDisplacement" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,25 +43,25 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/displacement' + from rootProject.ext.shaderPath + 'glsl/displacement' into 'assets/shaders/glsl/displacement' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'displacement_plane.gltf' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'stonefloor03_color_height_rgba.ktx' } diff --git a/android/examples/distancefieldfonts/build.gradle b/android/examples/distancefieldfonts/build.gradle index 80a65a56..6eccb50d 100644 --- a/android/examples/distancefieldfonts/build.gradle +++ b/android/examples/distancefieldfonts/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanDistancefieldfonts" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,31 +43,31 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/distancefieldfonts' + from rootProject.ext.shaderPath + 'glsl/distancefieldfonts' into 'assets/shaders/glsl/distancefieldfonts' include '*.*' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'font_sdf_rgba.ktx' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'font_bitmap_rgba.ktx' } copy { - from '../../../data/./' + from rootProject.ext.assetPath + './' into 'assets/./' include 'font.fnt' } diff --git a/android/examples/dynamicuniformbuffer/build.gradle b/android/examples/dynamicuniformbuffer/build.gradle index 54a798ad..f5bb1cfd 100644 --- a/android/examples/dynamicuniformbuffer/build.gradle +++ b/android/examples/dynamicuniformbuffer/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanDynamicuniformbuffer" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,13 +43,13 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/dynamicuniformbuffer' + from rootProject.ext.shaderPath + 'glsl/dynamicuniformbuffer' into 'assets/shaders/glsl/dynamicuniformbuffer' include '*.*' } diff --git a/android/examples/gears/build.gradle b/android/examples/gears/build.gradle index 4e0794ef..66edd92b 100644 --- a/android/examples/gears/build.gradle +++ b/android/examples/gears/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanGears" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,13 +43,13 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/gears' + from rootProject.ext.shaderPath + 'glsl/gears' into 'assets/shaders/glsl/gears' include '*.*' } diff --git a/android/examples/geometryshader/build.gradle b/android/examples/geometryshader/build.gradle index 16b97480..ffae1b1d 100644 --- a/android/examples/geometryshader/build.gradle +++ b/android/examples/geometryshader/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanGeometryshader" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,19 +43,19 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/geometryshader' + from rootProject.ext.shaderPath + 'glsl/geometryshader' into 'assets/shaders/glsl/geometryshader' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'suzanne.gltf' } diff --git a/android/examples/gltfloading/build.gradle b/android/examples/gltfloading/build.gradle index 793da675..f475101c 100644 --- a/android/examples/gltfloading/build.gradle +++ b/android/examples/gltfloading/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanglTFScene" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,19 +43,19 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/gltfloading' + from rootProject.ext.shaderPath + 'glsl/gltfloading' into 'assets/shaders/glsl/gltfloading' include '*.*' } copy { - from '../../../data/models/FlightHelmet/glTF' + from rootProject.ext.assetPath + 'models/FlightHelmet/glTF' into 'assets/models/FlightHelmet/glTF' include '*.*' } diff --git a/android/examples/gltfscenerendering/build.gradle b/android/examples/gltfscenerendering/build.gradle index 8894e77f..372031c2 100644 --- a/android/examples/gltfscenerendering/build.gradle +++ b/android/examples/gltfscenerendering/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanScenerendering" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,19 +43,19 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/gltfscenerendering' + from rootProject.ext.shaderPath +'glsl/gltfscenerendering' into 'assets/shaders/glsl/gltfscenerendering' include '*.*' } copy { - from '../../../data/models/sponza' + from rootProject.ext.assetPath + 'models/sponza' into 'assets/models/sponza' include '*.*' } diff --git a/android/examples/gltfskinning/build.gradle b/android/examples/gltfskinning/build.gradle index bc5567d0..4cbc9b59 100644 --- a/android/examples/gltfskinning/build.gradle +++ b/android/examples/gltfskinning/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanglTFSkinning" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,19 +43,19 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into "assets/shaders/glsl/base" include '*.spv' } copy { - from '../../../data/shaders/glsl/gltfskinning' + from rootProject.ext.shaderPath + 'glsl/gltfskinning' into 'assets/shaders/glsl/gltfskinning' include '*.*' } copy { - from '../../../data/models/CesiumMan/glTF' + from rootProject.ext.assetPath + 'models/CesiumMan/glTF' into 'assets/models/CesiumMan/glTF' include '*.*' } diff --git a/android/examples/hdr/build.gradle b/android/examples/hdr/build.gradle index a000d798..c3bd99c7 100644 --- a/android/examples/hdr/build.gradle +++ b/android/examples/hdr/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanHDR" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,49 +43,49 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/hdr' + from rootProject.ext.shaderPath + 'glsl/hdr' into 'assets/shaders/glsl/hdr' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'cube.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'sphere.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'teapot.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'torusknot.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'venus.gltf' } copy { - from '../../../data/textures/hdr' + from rootProject.ext.assetPath + 'textures/hdr' into 'assets/textures/hdr' include 'uffizi_cube.ktx' } diff --git a/android/examples/imgui/build.gradle b/android/examples/imgui/build.gradle index 4c404537..26cdc5a0 100644 --- a/android/examples/imgui/build.gradle +++ b/android/examples/imgui/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanImGui" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,31 +43,31 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/imgui' + from rootProject.ext.shaderPath + 'glsl/imgui' into 'assets/shaders/glsl/imgui' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'vulkanscenemodels.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'vulkanscenebackground.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'vulkanscenelogos.gltf' } diff --git a/android/examples/indirectdraw/build.gradle b/android/examples/indirectdraw/build.gradle index 45c8ae8c..66d8d878 100644 --- a/android/examples/indirectdraw/build.gradle +++ b/android/examples/indirectdraw/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanIndirectdraw" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,43 +43,43 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/indirectdraw' + from rootProject.ext.shaderPath + 'glsl/indirectdraw' into 'assets/shaders/glsl/indirectdraw' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'plants.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'plane_circle.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'sphere.gltf' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'texturearray_plants_rgba.ktx' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'ground_dry_rgba.ktx' } diff --git a/android/examples/inlineuniformblocks/build.gradle b/android/examples/inlineuniformblocks/build.gradle index 2f36d18a..8fdee692 100644 --- a/android/examples/inlineuniformblocks/build.gradle +++ b/android/examples/inlineuniformblocks/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanInlineuniformblocks" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,19 +43,19 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/inlineuniformblocks' + from rootProject.ext.shaderPath + 'glsl/inlineuniformblocks' into 'assets/shaders/glsl/inlineuniformblocks' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'sphere.gltf' } diff --git a/android/examples/inputattachments/build.gradle b/android/examples/inputattachments/build.gradle index c911ffab..1c70a375 100644 --- a/android/examples/inputattachments/build.gradle +++ b/android/examples/inputattachments/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanInputattachments" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -48,19 +48,19 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/inputattachments' + from rootProject.ext.shaderPath + 'glsl/inputattachments' into 'assets/shaders/glsl/inputattachments' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'treasure_smooth.gltf' } diff --git a/android/examples/instancing/build.gradle b/android/examples/instancing/build.gradle index f0fbaf9e..bd0c6a40 100644 --- a/android/examples/instancing/build.gradle +++ b/android/examples/instancing/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanInstancing" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,37 +43,37 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/instancing' + from rootProject.ext.shaderPath + 'glsl/instancing' into 'assets/shaders/glsl/instancing' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'rock01.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'lavaplanet.gltf' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'texturearray_rocks*.ktx' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'lavaplanet*.ktx' } diff --git a/android/examples/multisampling/build.gradle b/android/examples/multisampling/build.gradle index 493740c6..8ac6bff1 100644 --- a/android/examples/multisampling/build.gradle +++ b/android/examples/multisampling/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanMultisampling" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,19 +43,19 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/multisampling' + from rootProject.ext.shaderPath + 'glsl/multisampling' into 'assets/shaders/glsl/multisampling' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'voyager.gltf' } diff --git a/android/examples/multithreading/build.gradle b/android/examples/multithreading/build.gradle index 06e692ff..1f2095ff 100644 --- a/android/examples/multithreading/build.gradle +++ b/android/examples/multithreading/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanMultithreading" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,25 +43,25 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/multithreading' + from rootProject.ext.shaderPath + 'glsl/multithreading' into 'assets/shaders/glsl/multithreading' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'retroufo_red_lowpoly.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'sphere.gltf' } diff --git a/android/examples/multiview/build.gradle b/android/examples/multiview/build.gradle index a073ea63..bb1eab8e 100644 --- a/android/examples/multiview/build.gradle +++ b/android/examples/multiview/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanMultiview" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,19 +43,19 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/multiview' + from rootProject.ext.shaderPath + 'glsl/multiview' into 'assets/shaders/glsl/multiview' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'sampleroom.gltf' } diff --git a/android/examples/negativeviewportheight/build.gradle b/android/examples/negativeviewportheight/build.gradle index c80484c4..0c2f4225 100644 --- a/android/examples/negativeviewportheight/build.gradle +++ b/android/examples/negativeviewportheight/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanNegativeviewportheight" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,25 +43,25 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/negativeviewportheight' + from rootProject.ext.shaderPath + 'glsl/negativeviewportheight' into 'assets/shaders/glsl/negativeviewportheight' include '*.*' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'texture_orientation_ccw_rgba.ktx' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'texture_orientation_cw_rgba.ktx' } diff --git a/android/examples/occlusionquery/build.gradle b/android/examples/occlusionquery/build.gradle index 63f1d064..377e190b 100644 --- a/android/examples/occlusionquery/build.gradle +++ b/android/examples/occlusionquery/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanOcclusionquery" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,31 +43,31 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/occlusionquery' + from rootProject.ext.shaderPath + 'glsl/occlusionquery' into 'assets/shaders/glsl/occlusionquery' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'plane_z.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'teapot.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'sphere.gltf' } diff --git a/android/examples/offscreen/build.gradle b/android/examples/offscreen/build.gradle index ca6dcc4b..cd3e30ec 100644 --- a/android/examples/offscreen/build.gradle +++ b/android/examples/offscreen/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanOffscreen" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,25 +43,25 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/offscreen' + from rootProject.ext.shaderPath + 'glsl/offscreen' into 'assets/shaders/glsl/offscreen' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'plane.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'chinesedragon.gltf' } diff --git a/android/examples/oit/build.gradle b/android/examples/oit/build.gradle index 4c5025f0..88b97ce7 100644 --- a/android/examples/oit/build.gradle +++ b/android/examples/oit/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanOrderIndependentTransparency" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,25 +43,25 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/oit' + from rootProject.ext.shaderPath + 'glsl/oit' into 'assets/shaders/glsl/oit' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'sphere.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'cube.gltf' } diff --git a/android/examples/parallaxmapping/build.gradle b/android/examples/parallaxmapping/build.gradle index 886ff9dd..d3b0000a 100644 --- a/android/examples/parallaxmapping/build.gradle +++ b/android/examples/parallaxmapping/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanParallaxmapping" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,31 +43,31 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/parallaxmapping' + from rootProject.ext.shaderPath + 'glsl/parallaxmapping' into 'assets/shaders/glsl/parallaxmapping' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'planecd.gltf' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'rocks_normal_height_rgba.ktx' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'rocks_color*.ktx' } diff --git a/android/examples/particlefire/build.gradle b/android/examples/particlefire/build.gradle index 460dd7d9..63f628e6 100644 --- a/android/examples/particlefire/build.gradle +++ b/android/examples/particlefire/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanParticlefire" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,43 +43,43 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/particlefire' + from rootProject.ext.shaderPath + 'glsl/particlefire' into 'assets/shaders/glsl/particlefire' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'fireplace.gltf' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'particle_fire.ktx' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'particle_smoke.ktx' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'fireplace_normalmap*.ktx' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'fireplace_colormap*.ktx' } diff --git a/android/examples/pbrbasic/build.gradle b/android/examples/pbrbasic/build.gradle index 502c203a..8b78a683 100644 --- a/android/examples/pbrbasic/build.gradle +++ b/android/examples/pbrbasic/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanPBRBasic" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,37 +43,37 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/pbrbasic' + from rootProject.ext.shaderPath + 'glsl/pbrbasic' into 'assets/shaders/glsl/pbrbasic' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'sphere.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'teapot.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'torusknot.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'venus.gltf' } diff --git a/android/examples/pbribl/build.gradle b/android/examples/pbribl/build.gradle index 06ded538..62e8c402 100644 --- a/android/examples/pbribl/build.gradle +++ b/android/examples/pbribl/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanPBRIBL" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,49 +43,49 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/pbribl' + from rootProject.ext.shaderPath + 'glsl/pbribl' into 'assets/shaders/glsl/pbribl' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'cube.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'sphere.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'teapot.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'torusknot.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'venus.gltf' } copy { - from '../../../data/textures/hdr' + from rootProject.ext.assetPath + 'textures/hdr' into 'assets/textures/hdr' include 'pisa_cube.ktx' } diff --git a/android/examples/pbrtexture/build.gradle b/android/examples/pbrtexture/build.gradle index edd6c7cc..7c1f45d8 100644 --- a/android/examples/pbrtexture/build.gradle +++ b/android/examples/pbrtexture/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanPBRTexture" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,31 +43,31 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/pbrtexture' + from rootProject.ext.shaderPath + 'glsl/pbrtexture' into 'assets/shaders/glsl/pbrtexture' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'cube.gltf' } copy { - from '../../../data/textures/hdr' + from rootProject.ext.assetPath + 'textures/hdr' into 'assets/textures/hdr' include 'gcanyon_cube.ktx' } copy { - from '../../../data/models/cerberus' + from rootProject.ext.assetPath + 'models/cerberus' into 'assets/models/cerberus' include '*.*' } diff --git a/android/examples/pipelines/build.gradle b/android/examples/pipelines/build.gradle index 7d56b6b3..39d4f4e5 100644 --- a/android/examples/pipelines/build.gradle +++ b/android/examples/pipelines/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanPipelines" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,19 +43,19 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/pipelines' + from rootProject.ext.shaderPath + 'glsl/pipelines' into 'assets/shaders/glsl/pipelines' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'treasure_smooth.gltf' } diff --git a/android/examples/pipelinestatistics/build.gradle b/android/examples/pipelinestatistics/build.gradle index c2813ce8..7ce56487 100644 --- a/android/examples/pipelinestatistics/build.gradle +++ b/android/examples/pipelinestatistics/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanPipelinestatistics" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,37 +43,37 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/pipelinestatistics' + from rootProject.ext.shaderPath + 'glsl/pipelinestatistics' into 'assets/shaders/glsl/pipelinestatistics' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'sphere.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'teapot.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'torusknot.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'venus.gltf' } diff --git a/android/examples/pushconstants/build.gradle b/android/examples/pushconstants/build.gradle index 777f98ba..781404b1 100644 --- a/android/examples/pushconstants/build.gradle +++ b/android/examples/pushconstants/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanPushconstants" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,25 +43,25 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/pushconstants' + from rootProject.ext.shaderPath + 'glsl/pushconstants' into 'assets/shaders/glsl/pushconstants' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'sphere.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'samplescene.gltf' } diff --git a/android/examples/pushdescriptors/build.gradle b/android/examples/pushdescriptors/build.gradle index 590e5ee6..d4cfa547 100644 --- a/android/examples/pushdescriptors/build.gradle +++ b/android/examples/pushdescriptors/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanPushdescriptors" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,31 +43,31 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/pushdescriptors' + from rootProject.ext.shaderPath + 'glsl/pushdescriptors' into 'assets/shaders/glsl/pushdescriptors' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'cube.gltf' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'crate01_color_height_rgba.ktx' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'crate02_color_height_rgba.ktx' } diff --git a/android/examples/radialblur/build.gradle b/android/examples/radialblur/build.gradle index 8f3327ae..f441634a 100644 --- a/android/examples/radialblur/build.gradle +++ b/android/examples/radialblur/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanRadialblur" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,25 +43,25 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/radialblur' + from rootProject.ext.shaderPath + 'glsl/radialblur' into 'assets/shaders/glsl/radialblur' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'glowsphere.gltf' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'particle_gradient_rgba.ktx' } diff --git a/android/examples/rayquery/build.gradle b/android/examples/rayquery/build.gradle index 0d0c8866..24a12e97 100644 --- a/android/examples/rayquery/build.gradle +++ b/android/examples/rayquery/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanRayQuery" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,19 +43,19 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/rayquery' + from rootProject.ext.shaderPath + 'glsl/rayquery' into 'assets/shaders/glsl/rayquery' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'vulkanscene_shadow.gltf' } diff --git a/android/examples/raytracingbasic/build.gradle b/android/examples/raytracingbasic/build.gradle index bc40dea1..754626cb 100644 --- a/android/examples/raytracingbasic/build.gradle +++ b/android/examples/raytracingbasic/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanRaytracingbasic" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,13 +43,13 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/raytracingbasic' + from rootProject.ext.shaderPath + 'glsl/raytracingbasic' into 'assets/shaders/glsl/raytracingbasic' include '*.*' } diff --git a/android/examples/raytracingreflections/build.gradle b/android/examples/raytracingreflections/build.gradle index 06f6719b..774854e5 100644 --- a/android/examples/raytracingreflections/build.gradle +++ b/android/examples/raytracingreflections/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanRaytracingreflections" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,19 +43,19 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/raytracingreflections' + from rootProject.ext.shaderPath + 'glsl/raytracingreflections' into 'assets/shaders/glsl/raytracingreflections' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'reflection_scene.gltf' } diff --git a/android/examples/raytracingshadows/build.gradle b/android/examples/raytracingshadows/build.gradle index a1df218e..d36b99ec 100644 --- a/android/examples/raytracingshadows/build.gradle +++ b/android/examples/raytracingshadows/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanRaytracingshadows" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,19 +43,19 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/raytracingshadows' + from rootProject.ext.shaderPath + 'glsl/raytracingshadows' into 'assets/shaders/glsl/raytracingshadows' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'vulkanscene_shadow.gltf' } diff --git a/android/examples/renderheadless/build.gradle b/android/examples/renderheadless/build.gradle index a93c2d22..3875de88 100644 --- a/android/examples/renderheadless/build.gradle +++ b/android/examples/renderheadless/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanRenderheadless" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,13 +43,13 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/renderheadless' + from rootProject.ext.shaderPath + 'glsl/renderheadless' into 'assets/shaders/glsl/renderheadless' include '*.*' } diff --git a/android/examples/screenshot/build.gradle b/android/examples/screenshot/build.gradle index bb103596..27f10976 100644 --- a/android/examples/screenshot/build.gradle +++ b/android/examples/screenshot/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanScreenshot" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,19 +43,19 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/screenshot' + from rootProject.ext.shaderPath + 'glsl/screenshot' into 'assets/shaders/glsl/screenshot' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'chinesedragon.gltf' } diff --git a/android/examples/shadowmapping/build.gradle b/android/examples/shadowmapping/build.gradle index b102de96..6f633e70 100644 --- a/android/examples/shadowmapping/build.gradle +++ b/android/examples/shadowmapping/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanShadowmapping" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,25 +43,25 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/shadowmapping' + from rootProject.ext.shaderPath + 'glsl/shadowmapping' into 'assets/shaders/glsl/shadowmapping' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'vulkanscene_shadow.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'samplescene.gltf' } diff --git a/android/examples/shadowmappingcascade/build.gradle b/android/examples/shadowmappingcascade/build.gradle index 251a53ed..fc472392 100644 --- a/android/examples/shadowmappingcascade/build.gradle +++ b/android/examples/shadowmappingcascade/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanShadowmappingcascade" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,25 +43,25 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/shadowmappingcascade' + from rootProject.ext.shaderPath + 'glsl/shadowmappingcascade' into 'assets/shaders/glsl/shadowmappingcascade' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'terrain_gridlines.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'oaktree.gltf' } diff --git a/android/examples/shadowmappingomni/build.gradle b/android/examples/shadowmappingomni/build.gradle index cbdec3b7..eda1c362 100644 --- a/android/examples/shadowmappingomni/build.gradle +++ b/android/examples/shadowmappingomni/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanShadowmappingomni" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,25 +43,25 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/shadowmappingomni' + from rootProject.ext.shaderPath + 'glsl/shadowmappingomni' into 'assets/shaders/glsl/shadowmappingomni' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'shadowscene_fire.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'cube.gltf' } diff --git a/android/examples/specializationconstants/build.gradle b/android/examples/specializationconstants/build.gradle index bb7e0160..3b56f7ae 100644 --- a/android/examples/specializationconstants/build.gradle +++ b/android/examples/specializationconstants/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanSpecializationconstants" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,25 +43,25 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/specializationconstants' + from rootProject.ext.shaderPath + 'glsl/specializationconstants' into 'assets/shaders/glsl/specializationconstants' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'color_teapot_spheres.gltf' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'metalplate_nomips_rgba.ktx' } diff --git a/android/examples/sphericalenvmapping/build.gradle b/android/examples/sphericalenvmapping/build.gradle index b214f95a..946c7592 100644 --- a/android/examples/sphericalenvmapping/build.gradle +++ b/android/examples/sphericalenvmapping/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanSphericalenvmapping" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,25 +43,25 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/sphericalenvmapping' + from rootProject.ext.shaderPath + 'glsl/sphericalenvmapping' into 'assets/shaders/glsl/sphericalenvmapping' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'chinesedragon.gltf' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'matcap_array_rgba.ktx' } diff --git a/android/examples/ssao/build.gradle b/android/examples/ssao/build.gradle index b5d29ecc..0f525e5e 100644 --- a/android/examples/ssao/build.gradle +++ b/android/examples/ssao/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanSSAO" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,19 +43,19 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/ssao' + from rootProject.ext.shaderPath + 'glsl/ssao' into 'assets/shaders/glsl/ssao' include '*.*' } copy { - from '../../../data/models/sponza' + from rootProject.ext.assetPath + 'models/sponza' into 'assets/models/sponza' include '*.*' } diff --git a/android/examples/stencilbuffer/build.gradle b/android/examples/stencilbuffer/build.gradle index 8fbd1a45..a3c732b4 100644 --- a/android/examples/stencilbuffer/build.gradle +++ b/android/examples/stencilbuffer/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanStencilbuffer" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,19 +43,19 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/stencilbuffer' + from rootProject.ext.shaderPath + 'glsl/stencilbuffer' into 'assets/shaders/glsl/stencilbuffer' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'venus.gltf' } diff --git a/android/examples/subpasses/build.gradle b/android/examples/subpasses/build.gradle index 9480f39f..3332f2aa 100644 --- a/android/examples/subpasses/build.gradle +++ b/android/examples/subpasses/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanSubpasses" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,31 +43,31 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/subpasses' + from rootProject.ext.shaderPath + 'glsl/subpasses' into 'assets/shaders/glsl/subpasses' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'samplebuilding.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'samplebuilding_glass.gltf' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'colored_glass_rgba.ktx' } diff --git a/android/examples/terraintessellation/build.gradle b/android/examples/terraintessellation/build.gradle index d7c280fb..3803f8af 100644 --- a/android/examples/terraintessellation/build.gradle +++ b/android/examples/terraintessellation/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanTerraintessellation" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,37 +43,37 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/terraintessellation' + from rootProject.ext.shaderPath + 'glsl/terraintessellation' into 'assets/shaders/glsl/terraintessellation' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'sphere.gltf' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'skysphere*.ktx' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'terrain_texturearray*.ktx' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'terrain_heightmap_r16.ktx' } diff --git a/android/examples/tessellation/build.gradle b/android/examples/tessellation/build.gradle index 08204702..9ee511e5 100644 --- a/android/examples/tessellation/build.gradle +++ b/android/examples/tessellation/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanTessellation" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,19 +43,19 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/tessellation' + from rootProject.ext.shaderPath + 'glsl/tessellation' into 'assets/shaders/glsl/tessellation' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'deer.gltf' } diff --git a/android/examples/textoverlay/build.gradle b/android/examples/textoverlay/build.gradle index eb52548d..494beb0b 100644 --- a/android/examples/textoverlay/build.gradle +++ b/android/examples/textoverlay/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanTextoverlay" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,19 +43,19 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/textoverlay' + from rootProject.ext.shaderPath + 'glsl/textoverlay' into 'assets/shaders/glsl/textoverlay' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'cube.gltf' } diff --git a/android/examples/texture/build.gradle b/android/examples/texture/build.gradle index 35d48f69..388629e1 100644 --- a/android/examples/texture/build.gradle +++ b/android/examples/texture/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanTexture" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,19 +43,19 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/texture' + from rootProject.ext.shaderPath + 'glsl/texture' into 'assets/shaders/glsl/texture' include '*.*' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'metalplate01_rgba.ktx' } diff --git a/android/examples/texture3d/build.gradle b/android/examples/texture3d/build.gradle index 052453a3..a8c10459 100644 --- a/android/examples/texture3d/build.gradle +++ b/android/examples/texture3d/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanTexture3d" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,13 +43,13 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/texture3d' + from rootProject.ext.shaderPath + 'glsl/texture3d' into 'assets/shaders/glsl/texture3d' include '*.*' } diff --git a/android/examples/texturearray/build.gradle b/android/examples/texturearray/build.gradle index 78101ac9..39d3f977 100644 --- a/android/examples/texturearray/build.gradle +++ b/android/examples/texturearray/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanTexturearray" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,19 +43,19 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/texturearray' + from rootProject.ext.shaderPath + 'glsl/texturearray' into 'assets/shaders/glsl/texturearray' include '*.*' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'texturearray_rgba.ktx' } diff --git a/android/examples/texturecubemap/build.gradle b/android/examples/texturecubemap/build.gradle index b2b49e64..3da3cb5f 100644 --- a/android/examples/texturecubemap/build.gradle +++ b/android/examples/texturecubemap/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanTexturecubemap" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,49 +43,49 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/texturecubemap' + from rootProject.ext.shaderPath + 'glsl/texturecubemap' into 'assets/shaders/glsl/texturecubemap' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'sphere.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'teapot.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'torusknot.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'cube.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'venus.gltf' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'cubemap_yokohama_rgba.ktx' } diff --git a/android/examples/texturecubemaparray/build.gradle b/android/examples/texturecubemaparray/build.gradle index 3048e7cd..3cf57bfc 100644 --- a/android/examples/texturecubemaparray/build.gradle +++ b/android/examples/texturecubemaparray/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanTexturecubemapArray" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,49 +43,49 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/texturecubemaparray' + from rootProject.ext.shaderPath + 'glsl/texturecubemaparray' into 'assets/shaders/glsl/texturecubemaparray' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'sphere.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'teapot.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'torusknot.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'cube.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'venus.gltf' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'cubemap_array.ktx' } diff --git a/android/examples/texturemipmapgen/build.gradle b/android/examples/texturemipmapgen/build.gradle index c9eda9c6..8c3e5f1f 100644 --- a/android/examples/texturemipmapgen/build.gradle +++ b/android/examples/texturemipmapgen/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanTexturemipmapgen" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,25 +43,25 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/texturemipmapgen' + from rootProject.ext.shaderPath + 'glsl/texturemipmapgen' into 'assets/shaders/glsl/texturemipmapgen' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'tunnel_cylinder.gltf' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'metalplate_nomips_rgba.ktx' } diff --git a/android/examples/triangle/build.gradle b/android/examples/triangle/build.gradle index f85072f7..ee7e8b4b 100644 --- a/android/examples/triangle/build.gradle +++ b/android/examples/triangle/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanTriangle" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,13 +43,13 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/triangle' + from rootProject.ext.shaderPath + 'glsl/triangle' into 'assets/shaders/glsl/triangle' include '*.*' } diff --git a/android/examples/vertexattributes/build.gradle b/android/examples/vertexattributes/build.gradle index 38feb8f5..5e7e253d 100644 --- a/android/examples/vertexattributes/build.gradle +++ b/android/examples/vertexattributes/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanVertexattributes" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,19 +43,19 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/vertexattributes' + from rootProject.ext.shaderPath + 'glsl/vertexattributes' into 'assets/shaders/glsl/vertexattributes' include '*.*' } copy { - from '../../../data/models/sponza' + from rootProject.ext.assetPath + 'models/sponza' into 'assets/models/sponza' include '*.*' } diff --git a/android/examples/viewportarray/build.gradle b/android/examples/viewportarray/build.gradle index c816a92c..74def6e3 100644 --- a/android/examples/viewportarray/build.gradle +++ b/android/examples/viewportarray/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanViewportarray" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,19 +43,19 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/viewportarray' + from rootProject.ext.shaderPath + 'glsl/viewportarray' into 'assets/shaders/glsl/viewportarray' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'sampleroom.gltf' } diff --git a/android/examples/vulkanscene/build.gradle b/android/examples/vulkanscene/build.gradle index 20563716..6db1f1a0 100644 --- a/android/examples/vulkanscene/build.gradle +++ b/android/examples/vulkanscene/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.application' apply from: '../gradle/outputfilename.gradle' android { - compileSdkVersion 26 + compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { applicationId "de.saschawillems.vulkanVulkanscene" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" ndk { @@ -43,43 +43,43 @@ task copyTask { } copy { - from '../../../data/shaders/glsl/base' + from rootProject.ext.shaderPath + 'glsl/base' into 'assets/shaders/glsl/base' include '*.spv' } copy { - from '../../../data/shaders/glsl/vulkanscene' + from rootProject.ext.shaderPath + 'glsl/vulkanscene' into 'assets/shaders/glsl/vulkanscene' include '*.*' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'vulkanscenelogos.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'vulkanscenebackground.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'vulkanscenemodels.gltf' } copy { - from '../../../data/models' + from rootProject.ext.assetPath + 'models' into 'assets/models' include 'cube.gltf' } copy { - from '../../../data/textures' + from rootProject.ext.assetPath + 'textures' into 'assets/textures' include 'cubemap_vulkan.ktx' } diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar index 13372aef..7454180f 100644 Binary files a/android/gradle/wrapper/gradle-wrapper.jar and b/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index f21ad904..ffed3a25 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,5 @@ -#Sun Aug 04 12:29:22 CEST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip -org.gradle.jvmargs=-Xmx4096m diff --git a/android/gradlew b/android/gradlew index 9d82f789..c53aefaa 100755 --- a/android/gradlew +++ b/android/gradlew @@ -1,74 +1,129 @@ -#!/usr/bin/env bash +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum -warn ( ) { +warn () { echo "$*" -} +} >&2 -die ( ) { +die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -77,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -85,76 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/android/gradlew.bat b/android/gradlew.bat index 8a0b282a..107acd32 100644 --- a/android/gradlew.bat +++ b/android/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -8,20 +24,23 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,34 +64,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell