X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2FMakefile;h=965e8316e3044f492d042a949e0cda61d6ce3f3d;hb=541ee122f5f7b959d54e1f891bcbbfce4b209bf7;hp=fe3e67a767db76c2507a36d8c7f08923e52a5365;hpb=4c167745fe507659ed678ff6f4d51a44a7cf8b3a;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile index fe3e67a7..965e8316 100644 --- a/cinelerra-5.1/cinelerra/Makefile +++ b/cinelerra-5.1/cinelerra/Makefile @@ -441,19 +441,20 @@ ifneq (, $(filter $(PLATFORM), FreeBSD NetBSD)) LIBS += -lintl -liconv LIBS += -lexecinfo endif -LIBS += `pkg-config --libs OpenEXR` -LIBS += `pkg-config --libs flac` -LIBS += `pkg-config --libs libjpeg` -LIBS += `pkg-config --libs uuid` -LIBS += `pkg-config --libs theora` -LIBS += `pkg-config --libs vorbis` -LIBS += `pkg-config --libs sndfile` +LIBS += `pkg-config --libs OpenEXR 2>/dev/null` +LIBS += `pkg-config --libs flac 2>/dev/null` +LIBS += `pkg-config --libs libjpeg 2>/dev/null` +LIBS += `pkg-config --libs uuid 2>/dev/null` +LIBS += `pkg-config --libs theora 2>/dev/null` +LIBS += `pkg-config --libs vorbis 2>/dev/null` +LIBS += `pkg-config --libs sndfile 2>/dev/null` +LIBS += `pkg-config --libs x11 2>/dev/null` ifeq ($(WANT_LIBZMPEG),yes) LIBS += -la52 -ltwolame -lmp3lame endif LIBS += -lgif -ltheoraenc -ltheoradec -lvorbisfile -lvorbisenc -ltiff ifeq ($(shell uname -o), Android) -LIBS += -landroid-shmem -liconv jpt.a +LIBS += -landroid-shmem -liconv ../libbthread-master/jpt.a endif LIBS += $(shared_libs) LIBS += $(system_libs)