From 9b4e3a5d43847cc5ef5c9c4765cb426bb1a45af9 Mon Sep 17 00:00:00 2001 From: kelson42 Date: Sun, 21 Nov 2010 15:28:57 +0000 Subject: [PATCH] + remove bzip2 in Makefile.msvc --- src/zimlib/src/Makefile.mvsc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/zimlib/src/Makefile.mvsc b/src/zimlib/src/Makefile.mvsc index 3cc3ea1..a25d72c 100644 --- a/src/zimlib/src/Makefile.mvsc +++ b/src/zimlib/src/Makefile.mvsc @@ -3,22 +3,19 @@ LD=link.exe # Global paths Z=../../dependences/zlib-1.2.3 -BZIP2=../../dependences/bzip2-1.0.5 LZMA=../../dependences/xz-4.999.9beta/ # Include paths -BZIP2_INCLUDE=${BZIP2} Z_INCLUDE=${Z} LZMA_INCLUDE=${LZMA}/src/liblzma/api # Lib paths Z_LIB=${Z} -BZIP2_LIB=${BZIP2} LZMA_LIB=${LZMA}/windows # Compiler and linker flags -CFLAGS=-O2 -Oi -I"../include/win" -I"../include" -I"${LZMA_INCLUDE}" -I"${Z_INCLUDE}" -I"${BZIP2_INCLUDE}" -D"WIN32" -FD -EHsc -MT -Gy -nologo -c -Zi -TP -LDFLAGS=-LIBPATH:"$(Z_LIB)" -LIBPATH:"$(BZIP2_LIB)" -LIBPATH:"${LZMA_LIB}" +CFLAGS=-O2 -Oi -I"../include/win" -I"../include" -I"${LZMA_INCLUDE}" -I"${Z_INCLUDE}" -D"WIN32" -FD -EHsc -MT -Gy -nologo -c -Zi -TP +LDFLAGS=-LIBPATH:"$(Z_LIB)" -LIBPATH:"${LZMA_LIB}" all: zim.lib @@ -28,4 +25,4 @@ objs: $(CC) $(CFLAGS) *.cpp zim.lib: objs - $(LD) -lib -NOLOGO -NODEFAULTLIB:"MSVCRT" -MACHINE:X86 -OUT:zim.lib $(LDFLAGS) zlib.lib libbz2.lib liblzma.lib *.obj + $(LD) -lib -NOLOGO -NODEFAULTLIB:"MSVCRT" -MACHINE:X86 -OUT:zim.lib $(LDFLAGS) zlib.lib liblzma.lib *.obj