diff --git a/docker/win32-static/build_mujs.sh b/docker/win32-static/build_mujs.sh index ba84b8f4..e25bd92f 100644 --- a/docker/win32-static/build_mujs.sh +++ b/docker/win32-static/build_mujs.sh @@ -1,7 +1,7 @@ cd -wget https://mujs.com/downloads/mujs-1.3.3.tar.gz -rm -rf mujs-1.3.3 -tar -xf mujs-1.3.3.tar.gz -cd mujs-1.3.3 +wget https://mujs.com/downloads/mujs-1.3.4.tar.gz +rm -rf mujs-1.3.4 +tar -xf mujs-1.3.4.tar.gz +cd mujs-1.3.4 patch -p1 < ../mujs.diff -make CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar prefix=$HOME install +make CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar HAVE_READLINE=no prefix=$HOME install diff --git a/docker/win32-static/mujs.diff b/docker/win32-static/mujs.diff index 4fd3b45b..4763fc23 100644 --- a/docker/win32-static/mujs.diff +++ b/docker/win32-static/mujs.diff @@ -1,16 +1,5 @@ ---- mujs-1.3.3/Makefile 2023-01-10 11:11:11.000000000 +0000 -+++ mujs-1.3.3/Makefile.win 2023-11-07 16:18:12.781947760 +0000 -@@ -98,8 +98,8 @@ - $(CC) $(CFLAGS) $(OPTIM) -c -o $@ one.c - build/release/libmujs.a: build/release/libmujs.o - $(AR) cr $@ $^ --build/release/mujs: main.c build/release/libmujs.o -- $(CC) $(CFLAGS) $(OPTIM) -o $@ $^ -lm -DHAVE_READLINE -lreadline -+#build/release/mujs: main.c build/release/libmujs.o -+# $(CC) $(CFLAGS) $(OPTIM) -o $@ $^ -lm -DHAVE_READLINE -lreadline - build/release/mujs-pp: pp.c build/release/libmujs.o - $(CC) $(CFLAGS) $(OPTIM) -o $@ $^ -lm - +--- mujs-1.3.4/Makefile 2023-01-10 11:11:11.000000000 +0000 ++++ mujs-1.3.4/Makefile.win 2023-11-07 16:18:12.781947760 +0000 @@ -112,14 +112,13 @@ echo >> $@ Libs: -L$(libdir) -lmujs echo >> $@ Libs.private: -lm @@ -27,8 +16,8 @@ install -m 755 build/release/mujs-pp $(DESTDIR)$(bindir) install-static: install-common build/release/libmujs.a ---- mujs-1.3.3/Makefile 2023-11-07 16:20:17.847381765 +0000 -+++ mujs-1.3.3/Makefile.win 2023-11-07 16:22:46.616720069 +0000 +--- mujs-1.3.4/Makefile 2023-11-07 16:20:17.847381765 +0000 ++++ mujs-1.3.4/Makefile.win 2023-11-07 16:22:46.616720069 +0000 @@ -100,8 +100,8 @@ $(AR) cr $@ $^ #build/release/mujs: main.c build/release/libmujs.o diff --git a/docker/win64-static/build_mujs.sh b/docker/win64-static/build_mujs.sh index bfc45a15..e5a6a17b 100644 --- a/docker/win64-static/build_mujs.sh +++ b/docker/win64-static/build_mujs.sh @@ -1,7 +1,7 @@ cd -wget https://mujs.com/downloads/mujs-1.3.3.tar.gz -rm -rf mujs-1.3.3 -tar -xf mujs-1.3.3.tar.gz -cd mujs-1.3.3 +wget https://mujs.com/downloads/mujs-1.3.4.tar.gz +rm -rf mujs-1.3.4 +tar -xf mujs-1.3.4.tar.gz +cd mujs-1.3.4 patch -p1 < ../mujs.diff -make CC=x86_64-w64-mingw32-gcc AR=x86_64-w64-mingw32-ar prefix=$HOME install +make CC=x86_64-w64-mingw32-gcc AR=x86_64-w64-mingw32-ar HAVE_READLINE=no prefix=$HOME install diff --git a/docker/win64-static/mujs.diff b/docker/win64-static/mujs.diff index 4fd3b45b..4763fc23 100644 --- a/docker/win64-static/mujs.diff +++ b/docker/win64-static/mujs.diff @@ -1,16 +1,5 @@ ---- mujs-1.3.3/Makefile 2023-01-10 11:11:11.000000000 +0000 -+++ mujs-1.3.3/Makefile.win 2023-11-07 16:18:12.781947760 +0000 -@@ -98,8 +98,8 @@ - $(CC) $(CFLAGS) $(OPTIM) -c -o $@ one.c - build/release/libmujs.a: build/release/libmujs.o - $(AR) cr $@ $^ --build/release/mujs: main.c build/release/libmujs.o -- $(CC) $(CFLAGS) $(OPTIM) -o $@ $^ -lm -DHAVE_READLINE -lreadline -+#build/release/mujs: main.c build/release/libmujs.o -+# $(CC) $(CFLAGS) $(OPTIM) -o $@ $^ -lm -DHAVE_READLINE -lreadline - build/release/mujs-pp: pp.c build/release/libmujs.o - $(CC) $(CFLAGS) $(OPTIM) -o $@ $^ -lm - +--- mujs-1.3.4/Makefile 2023-01-10 11:11:11.000000000 +0000 ++++ mujs-1.3.4/Makefile.win 2023-11-07 16:18:12.781947760 +0000 @@ -112,14 +112,13 @@ echo >> $@ Libs: -L$(libdir) -lmujs echo >> $@ Libs.private: -lm @@ -27,8 +16,8 @@ install -m 755 build/release/mujs-pp $(DESTDIR)$(bindir) install-static: install-common build/release/libmujs.a ---- mujs-1.3.3/Makefile 2023-11-07 16:20:17.847381765 +0000 -+++ mujs-1.3.3/Makefile.win 2023-11-07 16:22:46.616720069 +0000 +--- mujs-1.3.4/Makefile 2023-11-07 16:20:17.847381765 +0000 ++++ mujs-1.3.4/Makefile.win 2023-11-07 16:22:46.616720069 +0000 @@ -100,8 +100,8 @@ $(AR) cr $@ $^ #build/release/mujs: main.c build/release/libmujs.o