From 550d8cc10f538d715671cd2422cddd8374513784 Mon Sep 17 00:00:00 2001 From: Choi Shing Wan Date: Tue, 8 Oct 2019 15:29:48 -0400 Subject: [PATCH] [Update] Improve the make file --- Makefile.win | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.win b/Makefile.win index 0b17ac7e..18761cb4 100644 --- a/Makefile.win +++ b/Makefile.win @@ -4,12 +4,12 @@ build?=x86_64 dir=/usr/local/Cellar/mingw-w64/${version}/toolchain-${build}/ CXX=${dir}/bin/${build}-w64-mingw32-g++ CXXFLAGS=-Wall -O3 -std=gnu++11 -DNDEBUG -static -lpthread -lpsapi -INCLUDES := -I inc/ -isystem lib/ -isystem window/zlib-1.2.11/ -isystem lib/eigen-git-mirror/ +INCLUDES := -I inc/ -isystem lib/ -isystem window/zlib-1.2.11_${build}/ -isystem lib/eigen-git-mirror/ CPPSRC := src/*.cpp OBJ := bgen_lib.o binaryplink.o genotype.o misc.o regression.o snp.o binarygen.o commander.o main.o plink_common.o prsice.o region.o reporter.o gzstream.o dcdflib.o fastlm.o -ZLIB := window/zlib-1.2.11/libz.a ${dir}/${build}-w64-mingw32/lib/libpsapi.a +ZLIB := window/zlib-1.2.11_${build}/libz.a ${dir}/${build}-w64-mingw32/lib/libpsapi.a %.o: src/%.cpp $(CXX) $(CXXFLAGS) $(INCLUDES) -c $< -o $@ -PRSice_win64.exe: $(OBJ) +PRSice_win${build}.exe: $(OBJ) $(CXX) $(CXXFLAGS) $(INCLUDES) $^ $(ZLIB) -o $@