aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--binary/Makefile.windows2
-rwxr-xr-xbinary/static-gcc3
2 files changed, 2 insertions, 3 deletions
diff --git a/binary/Makefile.windows b/binary/Makefile.windows
index ea8f0a60..e21ae8df 100644
--- a/binary/Makefile.windows
+++ b/binary/Makefile.windows
@@ -14,7 +14,6 @@ windows-binary: windows-deps/lib/liblua.a windows-deps/lib/libssl.a windows-deps
14 STATIC_GCC_AR=$(MINGW_PREFIX)-ar \ 14 STATIC_GCC_AR=$(MINGW_PREFIX)-ar \
15 STATIC_GCC_RANLIB=$(MINGW_PREFIX)-ranlib \ 15 STATIC_GCC_RANLIB=$(MINGW_PREFIX)-ranlib \
16 STATIC_GCC_CC=$(MINGW_PREFIX)-gcc \ 16 STATIC_GCC_CC=$(MINGW_PREFIX)-gcc \
17 STATIC_GCC_LIBDIR=$(MINGW_SYSROOT)/lib \
18 LUAROCKS_CROSS_COMPILING=1 \ 17 LUAROCKS_CROSS_COMPILING=1 \
19 make binary LUA_DIR=$(PWD)/windows-deps BINARY_CC=$(MINGW_PREFIX)-gcc BINARY_NM=$(MINGW_PREFIX)-nm BINARY_PLATFORM=windows BINARY_TARGET=build-windows-binary BINARY_SYSROOT=$(MINGW_SYSROOT) 18 make binary LUA_DIR=$(PWD)/windows-deps BINARY_CC=$(MINGW_PREFIX)-gcc BINARY_NM=$(MINGW_PREFIX)-nm BINARY_PLATFORM=windows BINARY_TARGET=build-windows-binary BINARY_SYSROOT=$(MINGW_SYSROOT)
20 19
@@ -37,6 +36,7 @@ build-windows-deps/openssl-$(OPENSSL_VERSION): build-windows-deps/openssl-$(OPEN
37 cd build-windows-deps && tar zxvpf openssl-$(OPENSSL_VERSION).tar.gz 36 cd build-windows-deps && tar zxvpf openssl-$(OPENSSL_VERSION).tar.gz
38windows-deps/lib/libssl.a: build-windows-deps/openssl-$(OPENSSL_VERSION) 37windows-deps/lib/libssl.a: build-windows-deps/openssl-$(OPENSSL_VERSION)
39 cd build-windows-deps/openssl-$(OPENSSL_VERSION) && ./Configure --prefix=$(PWD)/windows-deps --cross-compile-prefix=$(MINGW_PREFIX)- $(OPENSSL_PLATFORM) 38 cd build-windows-deps/openssl-$(OPENSSL_VERSION) && ./Configure --prefix=$(PWD)/windows-deps --cross-compile-prefix=$(MINGW_PREFIX)- $(OPENSSL_PLATFORM)
39 cd build-windows-deps/openssl-$(OPENSSL_VERSION) && make
40 cd build-windows-deps/openssl-$(OPENSSL_VERSION) && make install_sw 40 cd build-windows-deps/openssl-$(OPENSSL_VERSION) && make install_sw
41 41
42build-windows-deps/zlib-$(ZLIB_VERSION).tar.gz: 42build-windows-deps/zlib-$(ZLIB_VERSION).tar.gz:
diff --git a/binary/static-gcc b/binary/static-gcc
index c08f24b2..1e4ad0eb 100755
--- a/binary/static-gcc
+++ b/binary/static-gcc
@@ -3,7 +3,6 @@
3STATIC_GCC_AR=${STATIC_GCC_AR:-ar} 3STATIC_GCC_AR=${STATIC_GCC_AR:-ar}
4STATIC_GCC_RANLIB=${STATIC_GCC_RANLIB:-ranlib} 4STATIC_GCC_RANLIB=${STATIC_GCC_RANLIB:-ranlib}
5STATIC_GCC_CC=${STATIC_GCC_CC:-gcc} 5STATIC_GCC_CC=${STATIC_GCC_CC:-gcc}
6STATIC_GCC_LIBDIR=${STATIC_GCC_LIBDIR:-/usr/lib}
7 6
8DIR="$( cd "$( dirname "$0" )" && pwd )" 7DIR="$( cd "$( dirname "$0" )" && pwd )"
9 8
@@ -18,7 +17,7 @@ allargs=()
18sources=() 17sources=()
19objects=() 18objects=()
20etc=() 19etc=()
21libdirs=("$STATIC_GCC_LIBDIR") 20libdirs=($("$STATIC_GCC_CC" -print-search-dirs | grep libraries | cut -d= -f2 | tr ':' '\n'))
22incdirs=() 21incdirs=()
23 22
24linking=0 23linking=0