diff options
| -rw-r--r-- | binary/Makefile.windows | 6 | ||||
| -rwxr-xr-x | makedist | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/binary/Makefile.windows b/binary/Makefile.windows index e749cb00..4d7ce243 100644 --- a/binary/Makefile.windows +++ b/binary/Makefile.windows | |||
| @@ -7,9 +7,9 @@ MINGW_SYSROOT=/usr/lib/mingw-w64-sysroot/$(MINGW_PREFIX) | |||
| 7 | OPENSSL_PLATFORM=mingw | 7 | OPENSSL_PLATFORM=mingw |
| 8 | # Versions of dependencies | 8 | # Versions of dependencies |
| 9 | LIBLUA_VERSION=5.4.3 | 9 | LIBLUA_VERSION=5.4.3 |
| 10 | OPENSSL_VERSION=1.0.2o | 10 | OPENSSL_VERSION=1.1.1w |
| 11 | ZLIB_VERSION=1.3.1 | 11 | ZLIB_VERSION=1.3.1 |
| 12 | BZIP2_VERSION=1.0.6 | 12 | BZIP2_VERSION=1.0.8 |
| 13 | 13 | ||
| 14 | WINDOWS_DEPS_DIR=windows-deps-$(MINGW_PREFIX) | 14 | WINDOWS_DEPS_DIR=windows-deps-$(MINGW_PREFIX) |
| 15 | BUILD_WINDOWS_DEPS_DIR=build-windows-deps-$(MINGW_PREFIX) | 15 | BUILD_WINDOWS_DEPS_DIR=build-windows-deps-$(MINGW_PREFIX) |
| @@ -61,7 +61,7 @@ $(WINDOWS_DEPS_DIR)/lib/libz.a: $(BUILD_WINDOWS_DEPS_DIR)/zlib-$(ZLIB_VERSION) | |||
| 61 | 61 | ||
| 62 | $(BUILD_WINDOWS_DEPS_DIR)/bzip2-$(BZIP2_VERSION).tar.gz: | 62 | $(BUILD_WINDOWS_DEPS_DIR)/bzip2-$(BZIP2_VERSION).tar.gz: |
| 63 | mkdir -p $(@D) | 63 | mkdir -p $(@D) |
| 64 | cd $(BUILD_WINDOWS_DEPS_DIR) && curl -OL http://downloads.sourceforge.net/project/bzip2/bzip2-$(BZIP2_VERSION).tar.gz | 64 | cd $(BUILD_WINDOWS_DEPS_DIR) && curl -OL https://sourceware.org/pub/bzip2/bzip2-$(BZIP2_VERSION).tar.gz |
| 65 | $(BUILD_WINDOWS_DEPS_DIR)/bzip2-$(BZIP2_VERSION): $(BUILD_WINDOWS_DEPS_DIR)/bzip2-$(BZIP2_VERSION).tar.gz | 65 | $(BUILD_WINDOWS_DEPS_DIR)/bzip2-$(BZIP2_VERSION): $(BUILD_WINDOWS_DEPS_DIR)/bzip2-$(BZIP2_VERSION).tar.gz |
| 66 | cd $(BUILD_WINDOWS_DEPS_DIR) && tar zxvpf bzip2-$(BZIP2_VERSION).tar.gz | 66 | cd $(BUILD_WINDOWS_DEPS_DIR) && tar zxvpf bzip2-$(BZIP2_VERSION).tar.gz |
| 67 | $(WINDOWS_DEPS_DIR)/lib/libbz2.a: $(BUILD_WINDOWS_DEPS_DIR)/bzip2-$(BZIP2_VERSION) | 67 | $(WINDOWS_DEPS_DIR)/lib/libbz2.a: $(BUILD_WINDOWS_DEPS_DIR)/bzip2-$(BZIP2_VERSION) |
| @@ -23,7 +23,7 @@ shift || { | |||
| 23 | exit 1 | 23 | exit 1 |
| 24 | } | 24 | } |
| 25 | 25 | ||
| 26 | if ! [ -d "$lua54dir" ] | 26 | if ! [ -d "$lua54dir" -a -d "$lua54dir/lib" ] |
| 27 | then | 27 | then |
| 28 | echo "Second argument must be the Lua 5.4 prefix." | 28 | echo "Second argument must be the Lua 5.4 prefix." |
| 29 | exit 1 | 29 | exit 1 |
