From c8bd76bc900c12accb543465f82fa5bbfdf11dad Mon Sep 17 00:00:00 2001 From: Raul Santos Date: Wed, 22 Sep 2021 13:37:03 +0200 Subject: [PATCH 1/2] Use local `webpack` Use the locally installed `webpack` dependency. This way the `webpack` dependency doesn't need to be installed globally and added to the PATH. --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index b2ceb8c..802c438 100644 --- a/Makefile +++ b/Makefile @@ -18,12 +18,12 @@ build-debug: $(GODOT_DEBUG_SESSION)-debug tsc-debug @echo "build finished" tsc: - node_modules/.bin/tsc -p ./ - webpack --mode production + ./node_modules/.bin/tsc -p ./ + ./node_modules/.bin/webpack --mode production tsc-debug: - node_modules/.bin/tsc -p ./ - webpack --mode development + ./node_modules/.bin/tsc -p ./ + ./node_modules/.bin/webpack --mode development $(GODOT_DEBUG_SESSION): msbuild /p:Configuration=Release $(SOLUTION_DIR)/GodotDebugSession.sln From 9db0d10348b1cb3e919461e44bc24aeb2539cce7 Mon Sep 17 00:00:00 2001 From: Raul Santos Date: Wed, 22 Sep 2021 17:30:38 +0200 Subject: [PATCH 2/2] Add `restore` to Makefile Runs the Restore target prior to building the actual targets. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 802c438..7298f6e 100644 --- a/Makefile +++ b/Makefile @@ -26,10 +26,10 @@ tsc-debug: ./node_modules/.bin/webpack --mode development $(GODOT_DEBUG_SESSION): - msbuild /p:Configuration=Release $(SOLUTION_DIR)/GodotDebugSession.sln + msbuild /p:Configuration=Release /restore $(SOLUTION_DIR)/GodotDebugSession.sln $(GODOT_DEBUG_SESSION)-debug: - msbuild /p:Configuration=Debug $(SOLUTION_DIR)/GodotDebugSession.sln + msbuild /p:Configuration=Debug /restore $(SOLUTION_DIR)/GodotDebugSession.sln clean: msbuild /t:Clean $(SOLUTION_DIR)/GodotDebugSession.sln