diff options
| author | sr55 <[email protected]> | 2007-12-08 20:49:54 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2007-12-08 20:49:54 +0000 |
| commit | 2111b9f456626a91191f16de0ac122c847b9280a (patch) | |
| tree | 502ead5a3d4653baf4e33882b599879fcc33ce2b /test/Makefile | |
| parent | 63ee07ac2348ba5e4e47834656e1941df96814e1 (diff) | |
Updated jamfile to fix a small compile issue with zlib
Updated makefiles to support cygwin building on platforms other than XP
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1109 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'test/Makefile')
| -rw-r--r-- | test/Makefile | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/test/Makefile b/test/Makefile index cd88806e9..472eb5bc0 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,32 +1,32 @@ -SYSTEM = $(shell uname -s) - -ifeq ($(SYSTEM),CYGWIN_NT-5.1) - LIBS = a52 mkv avformat avcodec avutil dca dvdread faac mp3lame mpeg2 vorbis vorbisenc ogg samplerate x264 xvidcore mp4v2 swscale -else - LIBS = a52 mkv avformat avcodec avutil dca dvdread dvdcss faac mp3lame mpeg2 vorbis vorbisenc ogg samplerate x264 xvidcore mp4v2 swscale -endif - -all: ../HandBrakeCLI - -CFLAGS += -I../libhb -CXXFLAGS += -I../libhb -LIBS2 = ../libhb/libhb.a $(LIBS:%=../contrib/lib/lib%.a) -LDFLAGS += $(LIBS2) - -../HandBrakeCLI: test.c parsecsv.c $(LIBS2) - @CMD="$(CC) $(CFLAGS) -o test.o -c test.c"; $$CMD || \ - ( echo "Compile line for $@ was:"; echo $$CMD; false ) - @CMD="$(CC) $(CFLAGS) -o parsecsv.o -c parsecsv.c"; $$CMD || \ - ( echo "Compile line for $@ was:"; echo $$CMD; false ) - @echo "Link HandBrakeCLI" - @CMD="g++ $(CXXFLAGS) -o ../HandBrakeCLI test.o parsecsv.o $(LDFLAGS) -lz -lpthread"; $$CMD || \ - ( echo "Compile line for $@ was:"; echo $$CMD; false ) - @CMD="rm -rf ../plugins ; mkdir ../plugins ; cp ../contrib/lib/libquicktime/* ../plugins"; $$CMD - - -clean: - @echo "Clean HandBrakeCLI" - @$(RM) ../HandBrakeCLI - @$(RM) ../HandBrakeCLI.exe - @$(RM) *.o - +SYSTEM = $(shell uname -s)
+
+ifeq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT)
+ LIBS = a52 mkv avformat avcodec avutil dca dvdread faac mp3lame mpeg2 vorbis vorbisenc ogg samplerate x264 xvidcore mp4v2 swscale
+else
+ LIBS = a52 mkv avformat avcodec avutil dca dvdread dvdcss faac mp3lame mpeg2 vorbis vorbisenc ogg samplerate x264 xvidcore mp4v2 swscale
+endif
+
+all: ../HandBrakeCLI
+
+CFLAGS += -I../libhb
+CXXFLAGS += -I../libhb
+LIBS2 = ../libhb/libhb.a $(LIBS:%=../contrib/lib/lib%.a)
+LDFLAGS += $(LIBS2)
+
+../HandBrakeCLI: test.c parsecsv.c $(LIBS2)
+ @CMD="$(CC) $(CFLAGS) -o test.o -c test.c"; $$CMD || \
+ ( echo "Compile line for $@ was:"; echo $$CMD; false )
+ @CMD="$(CC) $(CFLAGS) -o parsecsv.o -c parsecsv.c"; $$CMD || \
+ ( echo "Compile line for $@ was:"; echo $$CMD; false )
+ @echo "Link HandBrakeCLI"
+ @CMD="g++ $(CXXFLAGS) -o ../HandBrakeCLI test.o parsecsv.o $(LDFLAGS) -lz -lpthread"; $$CMD || \
+ ( echo "Compile line for $@ was:"; echo $$CMD; false )
+ @CMD="rm -rf ../plugins ; mkdir ../plugins ; cp ../contrib/lib/libquicktime/* ../plugins"; $$CMD
+
+
+clean:
+ @echo "Clean HandBrakeCLI"
+ @$(RM) ../HandBrakeCLI
+ @$(RM) ../HandBrakeCLI.exe
+ @$(RM) *.o
+
|