From ae80da9cff5fb0e106d1ca2ca53534cf5058a45c Mon Sep 17 00:00:00 2001 From: Robert Konrad Date: Sun, 31 Jul 2016 03:42:19 +0200 Subject: [PATCH] Update khamake and also update khafiles accordingly khafiles are now asynchronous. --- Kore | 2 +- Tests/Empty/khafile.js | 4 ++-- Tests/Gamepads/khafile.js | 4 ++-- Tests/MultiWindow/khafile.js | 4 ++-- Tools/khamake | 2 +- make.js | 3 +-- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Kore b/Kore index 3b64d3054..8918327ff 160000 --- a/Kore +++ b/Kore @@ -1 +1 @@ -Subproject commit 3b64d30541e8e124dc4a4506423a0bb8d8646c5d +Subproject commit 8918327ffe24a6c635c199376c7ebf76daeb19a7 diff --git a/Tests/Empty/khafile.js b/Tests/Empty/khafile.js index a1613716a..c344f0c9e 100644 --- a/Tests/Empty/khafile.js +++ b/Tests/Empty/khafile.js @@ -1,5 +1,5 @@ -var project = new Project('Empty'); +let project = new Project('Empty'); project.addSources('Sources'); -return project; +resolve(project); diff --git a/Tests/Gamepads/khafile.js b/Tests/Gamepads/khafile.js index 5b4875e40..0dde2b1fa 100644 --- a/Tests/Gamepads/khafile.js +++ b/Tests/Gamepads/khafile.js @@ -1,5 +1,5 @@ -var project = new Project('Gamepads'); +let project = new Project('Gamepads'); project.addSources('src'); -return project; +resolve(project); diff --git a/Tests/MultiWindow/khafile.js b/Tests/MultiWindow/khafile.js index 54d73e08e..c1e725c83 100644 --- a/Tests/MultiWindow/khafile.js +++ b/Tests/MultiWindow/khafile.js @@ -1,5 +1,5 @@ -var project = new Project('MultiWindow'); +let project = new Project('MultiWindow'); project.addSources('Sources'); -return project; +resolve(project); diff --git a/Tools/khamake b/Tools/khamake index e1edf72e8..58b2f5e13 160000 --- a/Tools/khamake +++ b/Tools/khamake @@ -1 +1 @@ -Subproject commit e1edf72e86333e03ae1f596ae764ff7f16a6a676 +Subproject commit 58b2f5e13d957651556f63887f57ff8aa2b4d0d7 diff --git a/make.js b/make.js index 0c0996364..ab6c1a23e 100644 --- a/make.js +++ b/make.js @@ -1,2 +1 @@ -// The is the entry point to build Kha projects. -require('./Tools/khamake/khamake.js') \ No newline at end of file +require('./Tools/khamake/khamake.js');