Skip to content

Commit

Permalink
Merge pull request #148 from konstructs/remove-zlib-download
Browse files Browse the repository at this point in the history
Assume that is already in place, rm downl logic.
  • Loading branch information
nsg committed Dec 30, 2015
2 parents 6f98338 + dc75b46 commit 3857a1c
Showing 1 changed file with 4 additions and 14 deletions.
18 changes: 4 additions & 14 deletions package/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -56,25 +56,15 @@ windows:

/tmp/build-deps/zlib:
@echo -e "\033[1m"
@echo "# Download zlib lib for Windows"
@echo "# ERROR: Place zlib lib for Windows in /tmp/build-deps/zlib"
@echo -e "\033[0m"

mkdir -p /tmp/build-deps/zlib
wget http://netcologne.dl.sourceforge.net/project/gnuwin32/zlib/1.2.3/zlib-1.2.3-lib.zip \
-O /tmp/build-deps/zlib-1.2.3-lib.zip
echo "b0a2df1a2b0dd0bd801d71d06ce42360 /tmp/build-deps/zlib-1.2.3-lib.zip" | md5sum -c -
cd /tmp/build-deps/zlib && unzip ../zlib*lib.zip
exit 1

/tmp/build-deps/zlib-bin:
@echo -e "\033[1m"
@echo "# Download zlib bin for Windows"
@echo "# ERROR: Place zlib bin for Windows in /tmp/build-deps/zlib-bin"
@echo -e "\033[0m"

mkdir -p /tmp/build-deps/zlib-bin
wget http://netcologne.dl.sourceforge.net/project/gnuwin32/zlib/1.2.3/zlib-1.2.3-bin.zip \
-O /tmp/build-deps/zlib-1.2.3-bin.zip
echo "0b431b557399c1b3948c13c803a22c95 /tmp/build-deps/zlib-1.2.3-bin.zip" | md5sum -c -
cd /tmp/build-deps/zlib-bin && unzip ../zlib*bin.zip
exit 1

docker-windows: export CC = /usr/bin/x86_64-w64-mingw32-gcc
docker-windows: export CXX = /usr/bin/x86_64-w64-mingw32-g++
Expand Down

0 comments on commit 3857a1c

Please sign in to comment.