From 08a419e5bdb36c9691a04acdb55cc216f7e280cc Mon Sep 17 00:00:00 2001 From: Maykel Arias Torres Date: Wed, 28 Aug 2019 08:51:27 -0400 Subject: [PATCH] [Makefile][travis] refs #38 Added mingw32-zlib in windows --- .travis.yml | 4 ++-- Makefile | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 29073fa3c..5d5bc0321 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,8 +33,8 @@ install: - make install-deps-libc - make install-deps-skyapi script: - # - make lint - - make build-skyapi + - make lint + # - make build-skyapi # - make test-libc # - make lint-libc # - make test-skyapi diff --git a/Makefile b/Makefile index fe9c91b5b..9e70b7dca 100644 --- a/Makefile +++ b/Makefile @@ -213,6 +213,7 @@ install-deps-skyapi-Darwin: (cd deps && wget http://curl.haxx.se/download/curl-7.58.0.tar.gz && tar -xf curl-7.58.0.tar.gz && cd curl-7.58.0/ && mkdir build && cd build && cmake -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl .. && make && sudo make install) install-deps-skyapi-MSYS_NT-10.0: + mingw32-make mingw32-zlib # (cd deps && wget http://curl.haxx.se/download/curl-7.58.0.tar.gz && tar -xf curl-7.58.0.tar.gz && cd curl-7.58.0/ && mkdir build && cd build && cmake -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ .. && make && sudo make install) install-deps-libc: install-deps-libc-$(UNAME_S) ## Install deps for libc