diff options
| author | sr55 <[email protected]> | 2008-09-30 18:12:19 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2008-09-30 18:12:19 +0000 |
| commit | a533a9e53112490f897c1d3b2f8207b6dd4f007e (patch) | |
| tree | 37f00a8d078695de16df926f8fef9a1fc2c7cd6d | |
| parent | a1cbb75e9084928b3ebd305c880238e6fd3e0c50 (diff) | |
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
| -rw-r--r-- | libhb/Makefile | 4 | ||||
| -rw-r--r-- | test/Makefile | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/libhb/Makefile b/libhb/Makefile index 46cf2c65d..fba6c5d59 100644 --- 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 c4d4787d7..219d594d8 100644 --- 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) |