Merge branch 'master' into format_floating_point_error_in_test_output

LuaLS · Sep 18, 2024 · cb5783b · cb5783b
2 parents 3e90f68 + f95eb32
commit cb5783b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 2 deletions.
diff --git a/changelog.md b/changelog.md
@@ -4,6 +4,7 @@
 <!-- Add all new changes here. They will be moved under a version at release -->
 * `NEW` Added support for Japanese locale
 * `FIX` Eliminate floating point error in test benchmark output
+* `FIX` Remove luamake install from make scripts
 
 ## 3.10.6
 `2024-9-10`

diff --git a/make.bat b/make.bat
@@ -1,6 +1,5 @@
 git submodule update --init --recursive
 cd 3rd\luamake
-call compile\install.bat
 call compile\build.bat
 cd ..\..
 IF "%~1"=="" (

diff --git a/make.sh b/make.sh
@@ -2,7 +2,6 @@
 
 git submodule update --init --recursive
 pushd 3rd/luamake
-./compile/install.sh
 ./compile/build.sh
 popd
 if [ -z "$1" ]; then