X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=mingw64_deps%2Fzlib%2Fbuild.sh;h=70b5babf9ff746fa3fe295c02a85ba5032c1ee34;hb=0c5674bb94bfe46bc1923ec934335a6e81d0eabb;hp=6148b64c2ab43a468eb16728c8b32884cabfef14;hpb=d7469c0fe55489aa17f8cee6f21b39da17c60ca9;p=novacoin.git

diff --git a/mingw64_deps/zlib/build.sh b/mingw64_deps/zlib/build.sh
index 6148b64..70b5bab 100755
--- a/mingw64_deps/zlib/build.sh
+++ b/mingw64_deps/zlib/build.sh
@@ -9,19 +9,32 @@ echo "Expected either aarch64 or x86_64."
 exit 1
 fi
 
-# Make build directories
-mkdir ${ROOT}/${CROSS}-w64-mingw32-build
+if [[ ! $(which ${CROSS}-w64-mingw32-clang) ]]; then
+echo "llvm-mingw is not installed, please download it from https://github.com/mstorsjo/llvm-mingw/releases"
+exit 1
+fi
+
+if [[ ! $(which make) ]]; then
+echo "make is not installed, please install buld-essential package"
+exit 1
+fi
+
+# Make build directoriy
+cp -r ${ROOT}/zlib ${ROOT}/${CROSS}-w64-mingw32-build-zlib
 
 # Stage directory
 mkdir ${ROOT}/${CROSS}-w64-mingw32
 
 # Compile zlib
+cd ${ROOT}/${CROSS}-w64-mingw32-build-zlib
+perl -i -pe "s,(PREFIX =)\$,\$1 ${CROSS}-w64-mingw32-," win32/Makefile.gcc
+perl -i -pe "s,(CFLAGS =.*)\$,\$1 -fstack-protector-all -D_FORTIFY_SOURCE," win32/Makefile.gcc
+perl -i -pe "s,(LDFLAGS =.*)\$,\$1 -fstack-protector-all," win32/Makefile.gcc
+make -j 4 -f win32/Makefile.gcc
 
-cd ${ROOT}/${CROSS}-w64-mingw32-build
-CC=${CROSS}-w64-mingw32-gcc CXX=${CROSS}-w64-mingw32-g++ ${ROOT}/zlib/configure --prefix=${ROOT}/${CROSS}-w64-mingw32
-#make -j 4
-make install
+# Install zlib to our cross-tools directory
+make install DESTDIR=${ROOT}/${CROSS}-w64-mingw32 INCLUDE_PATH=/include LIBRARY_PATH=/lib BINARY_PATH=/bin -f win32/Makefile.gcc
 
-# Remove build directore
+# Remove build directory
 cd ${ROOT}
-rm -rf ${ROOT}/${CROSS}-w64-mingw32-build
+rm -rf ${ROOT}/${CROSS}-w64-mingw32-build-zlib