diff options
| author | prigaux <[email protected]> | 2007-03-06 21:15:55 +0000 |
|---|---|---|
| committer | prigaux <[email protected]> | 2007-03-06 21:15:55 +0000 |
| commit | c4a642b4648d486777af91ccc2894355df447089 (patch) | |
| tree | 4ff9eee3e39a530cb649d9db43456e0ab3d712a3 /test/Makefile | |
| parent | ff5ed5d2a2009504f1da3cf348689a59a82b27f1 (diff) | |
Merge the 5.1 branch into the trunk.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@422 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'test/Makefile')
| -rw-r--r-- | test/Makefile | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/test/Makefile b/test/Makefile index 3e7a65971..e368f8c6c 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,29 +1,30 @@ SYSTEM = $(shell uname -s) ifeq ($(SYSTEM),CYGWIN_NT-5.1) - LIBS = a52 avformat avcodec avutil dvdread faac mp3lame mpeg2 vorbis vorbisenc ogg samplerate x264 xvidcore mp4v2 + LIBS = a52 avformat avcodec avutil dvdread faac mp3lame mpeg2 vorbis vorbisenc ogg samplerate x264 xvidcore mp4v2 quicktime else - LIBS = a52 avformat avcodec avutil dvdread dvdcss faac mp3lame mpeg2 vorbis vorbisenc ogg samplerate x264 xvidcore mp4v2 + LIBS = a52 avformat avcodec avutil dvdread dvdcss faac mp3lame mpeg2 vorbis vorbisenc ogg samplerate x264 xvidcore mp4v2 quicktime endif -all: ../MediaForkCLI +all: ../HandBrakeCLI -CFLAGS += -I../libmediafork -CXXFLAGS += -I../libmediafork -LIBS2 = ../libmediafork/libmediafork.a $(LIBS:%=../contrib/lib/lib%.a) +CFLAGS += -I../libhb +CXXFLAGS += -I../libhb +LIBS2 = ../libhb/libhb.a $(LIBS:%=../contrib/lib/lib%.a) LDFLAGS += $(LIBS2) -../MediaForkCLI: test.c $(LIBS2) +../HandBrakeCLI: test.c $(LIBS2) @CMD="$(CC) $(CFLAGS) -o test.o -c test.c"; $$CMD || \ ( echo "Compile line for $@ was:"; echo $$CMD; false ) - @echo "Link MediaForkCLI" - @CMD="g++ $(CXXFLAGS) -o ../MediaForkCLI test.o $(LDFLAGS) -lz -lpthread"; $$CMD || \ + @echo "Link HandBrakeCLI" + @CMD="g++ $(CXXFLAGS) -o ../HandBrakeCLI test.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 MediaForkCLI" - @$(RM) ../MediaForkCLI - @$(RM) ../MediaForkCLI.exe + @echo "Clean HandBrakeCLI" + @$(RM) ../HandBrakeCLI + @$(RM) ../HandBrakeCLI.exe @$(RM) *.o |