CygWin:

- Fixes make building on cygwin (I think - I was seeing some cygwin lib errors before however these seem to have just disappeared. If anyone has a failed build due to this, let me know.)

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1796 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/libhb/Makefile b/libhb/Makefile
index 46cf2c65d743beffdaceb6fb382b6700da3505e9..fba6c5d59e418f50f1abdba023e31919945ff531 100644 (file)
--- a/libhb/Makefile
+++ b/libhb/Makefile
@@ -40,6 +40,10 @@ CONTRIBS = ../contrib/lib/liba52.a ../contrib/lib/libavformat.a \
                   ../contrib/lib/libxvidcore.a  ../contrib/lib/libmp4v2.a \
                   ../contrib/lib/libmkv.a ../contrib/lib/libswscale.a \
                   ../contrib/lib/libtheora.a ../contrib/lib/libfaad.a
+                  
+ifeq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT)
+       CONTRIBS += ../contrib/lib/libz.a ../contrib/lib/libbz2.a
+endif
 
 CFLAGS += -I../contrib/include -D__LIBHB__ -DUSE_PTHREAD $(SYSDEF) -Wall -g -O3 -funroll-loops
 

diff --git a/test/Makefile b/test/Makefile
index c4d4787d7640cfcfafb351f2cc51adf6ad5159fe..219d594d89ec4af5c881f53c123af426e4f373c1 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -3,11 +3,18 @@ SYSTEM = $(shell uname -s)
 LIBS = a52 mkv avformat avcodec avutil dca dvdread faac mp3lame mpeg2 vorbis \
           vorbisenc ogg samplerate x264 xvidcore mp4v2 swscale theora faad
 
+CYGLIBS = zlib bzip2
+
 all: ../HandBrakeCLI
 
 CFLAGS += -I../libhb
 CXXFLAGS += -I../libhb
 LIBS2 = ../libhb/libhb.a $(LIBS:%=../contrib/lib/lib%.a)
+
+ifeq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT)
+       LIBS2 += $(CYGLIBS:%=../contrib/lib/libz.a) $(CYGLIBS:%=../contrib/lib/libbz2.a)
+endif
+
 LDFLAGS += $(LIBS2) -lbz2 -ldl
 
 ../HandBrakeCLI: test.c parsecsv.c $(LIBS2)