From aa7f29e2ba6b8fc0d05246e4aa1ffccac2427b3a Mon Sep 17 00:00:00 2001
From: Lubos Lenco <lubos.lenco@gmail.com>
Date: Wed, 9 Mar 2022 17:37:17 +0100
Subject: [PATCH] Switch to kmake

---
 README.md    | 16 ++++++++--------
 kincflags.js | 24 ++++++++++--------------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index 9f7f20bb..a75c2d79 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ node armorcore/make -g direct3d11
 cd armorcore
 # Unpack `v8\libraries\win32\release\v8_monolith.7z` using 7-Zip - Extract Here (exceeds 100MB)
 git apply patch/window_handling.diff --directory=Kinc
-node Kinc/make.js -g direct3d11
+Kinc/make -g direct3d11
 # Open generated Visual Studio project at `build\ArmorPaint.sln`
 # Build and run for x64 & release
 ```
@@ -29,7 +29,7 @@ node Kinc/make.js -g direct3d11
 ```bash
 node armorcore/make -g opengl
 cd armorcore
-node Kinc/make.js -g opengl --compiler clang --compile
+Kinc/make -g opengl --compiler clang --compile
 cd Deployment
 strip ArmorPaint
 ./ArmorPaint ../../build/krom
@@ -41,7 +41,7 @@ node armorcore/make -g metal
 cp -a build/krom/ armorcore/Deployment
 cd armorcore
 git apply patch/metal_depth.diff --directory=Kinc
-node Kinc/make.js -g metal
+Kinc/make -g metal
 # Open generated Xcode project at `build/ArmorPaint.xcodeproj`
 # Build and run
 ```
@@ -52,7 +52,7 @@ node armorcore/make android -g opengl --shaderversion 300
 cp -r build/krom/* armorcore/build/ArmorPaint/app/src/main/assets/
 cd armorcore
 git apply patch/android_document_picker.diff --directory=Kinc
-node Kinc/make.js android -g opengl
+Kinc/make android -g opengl
 # Manual tweaking is required for now:
 # https://github.com/armory3d/armorcore/blob/master/kincfile.js#L68
 # Open generated Android Studio project at `build/ArmorPaint`
@@ -67,7 +67,7 @@ cd armorcore
 git apply patch/ios_document_picker.diff --directory=Kinc
 git apply patch/metal_depth.diff --directory=Kinc
 git clone https://github.com/armory3d/armorpaint_plugins Libraries/plugins
-node Kinc/make.js ios -g metal
+Kinc/make ios -g metal
 # Open generated Xcode project `build/ArmorPaint.xcodeproj`
 # Set iOS Deployment Target to 11.0
 # Build for device in release mode
@@ -81,7 +81,7 @@ cd armorcore
 git apply patch/window_handling.diff --directory=Kinc
 git apply patch/d3d12_raytrace.diff --directory=Kinc
 git apply patch/d3d12_wrap_sampler.diff --directory=Kinc
-node Kinc/make.js -g direct3d12
+Kinc/make -g direct3d12
 # Open generated Visual Studio project at `build\ArmorPaint.sln`
 # Build and run for x64 & release
 ```
@@ -92,7 +92,7 @@ node armorcore/make -g vulkan
 cd armorcore
 git apply patch/vulkan_raytrace.diff --directory=Kinc
 git clone --recursive https://github.com/armory3d/glsl_to_spirv Libraries/glsl_to_spirv
-node Kinc/make.js -g vulkan --compiler clang --compile
+Kinc/make -g vulkan --compiler clang --compile
 cd Deployment
 strip ArmorPaint
 ./ArmorPaint ../../build/krom
@@ -104,7 +104,7 @@ node armorcore/make -g direct3d11 --vr oculus
 cd armorcore
 # Unpack `v8\libraries\win32\release\v8_monolith.7z` using 7-Zip - Extract Here (exceeds 100MB)
 git apply patch/window_handling.diff --directory=Kinc
-node Kinc/make.js -g direct3d11 --vr oculus
+Kinc/make -g direct3d11 --vr oculus
 # Open generated Visual Studio project at `build\ArmorPaint.sln`
 # Build and run for x64 & release
 ```
diff --git a/kincflags.js b/kincflags.js
index a5e394cd..0c817e61 100644
--- a/kincflags.js
+++ b/kincflags.js
@@ -1,15 +1,11 @@
 
-// Imported by armorcore/kincfile.js
-module.exports = {
-	set_flags: function(flags, platform, graphics) {
-		flags.name = 'ArmorPaint';
-		flags.package = 'org.armorpaint';
-		flags.with_d3dcompiler = true;
-		flags.with_nfd = true;
-		flags.with_tinydir = true;
-		flags.with_zlib = true;
-		flags.with_stb_image_write = true;
-		flags.with_krafix = graphics === 'vulkan'; // glsl to spirv for vulkan
-		flags.with_plugin_embed = platform === 'ios';
-	}
-};
+// Imported by armorcore/kfile.js
+flags.name = 'ArmorPaint';
+flags.package = 'org.armorpaint';
+flags.with_d3dcompiler = true;
+flags.with_nfd = true;
+flags.with_tinydir = true;
+flags.with_zlib = true;
+flags.with_stb_image_write = true;
+flags.with_krafix = graphics === 'vulkan'; // glsl to spirv for vulkan
+flags.with_plugin_embed = platform === 'ios';