Credit Andrew - fix vorbis audio which was scratchy and ensure aging plugin does...

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / Makefile

diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile
index 5822d5a28b80a77b02a56922cfe97b3354307615..1cb58d504d29479b24f2de84b35f3e7d8681b8d9 100644 (file)
--- a/cinelerra-5.1/cinelerra/Makefile
+++ b/cinelerra-5.1/cinelerra/Makefile
@@ -437,23 +437,32 @@ ifeq ($(WANT_CIN_3RDPARTY),no)
 LIBS += -lavfilter -lavformat -lavcodec -lavutil
 LIBS += -lswresample -lswscale
 PLATFORM = $(shell uname -s)
-ifneq (, $(filter $(PLATFORM), FreeBSD NetBSD))
+ifneq (, $(filter $(PLATFORM), NetBSD))
+LIBS += -lintl
+endif
+ifneq (, $(filter $(PLATFORM), FreeBSD))
 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_DV),yes)
+LIBS += `pkg-config --libs libiec61883 2>/dev/null`
+LIBS += `pkg-config --libs libdv 2>/dev/null`
+LIBS += `pkg-config --libs libavc1394  2>/dev/null`
+endif
 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)
@@ -483,6 +492,7 @@ LV2OBJS = \
        $(OBJDIR)/pluginlv2ui.o \
        $(OBJDIR)/pluginlv2config.o \
        $(OBJDIR)/forkbase.o
+LIBS += `pkg-config --libs lilv-0`
 endif
 
 CFLAGS := \
@@ -516,7 +526,7 @@ CFLAGS += -DUSE_ALPHA
 
 else
 
-LDFLAGS1 = -Wl,-export-dynamic -g
+LDFLAGS1 = -Wl,-export-dynamic -g -Wl,-z,noexecstack
 LDFLAGS2 = $(LDFLAGS)
 LINKER = $(CXX) -o $(OUTPUT)
 
@@ -534,6 +544,7 @@ all:        $(OUTPUT) $(CUTADS) $(BDWRITE) $(LV2UI)
 $(OUTPUT): $(OBJS) $(THEME_DATA) $(DCRAW) $(LIBRARIES)
        $(LINKER) `cat $(OBJDIR)/objs`
        $(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(OUTPUT) $(OUTPUT_G))
+       $(if $(findstring -g,$(CFLAGS)),objcopy --add-gnu-debuglink=$(OUTPUT_G) $(OUTPUT))
        $(if $(findstring -ggdb,$(CFLAGS)),,strip $(OUTPUT))
        ln -f -s ../bin/$(WANT_CIN) ci
 
@@ -542,6 +553,7 @@ $(CUTADS):  $(CUTOBJS) $(CUTLIBS) $(LIBRARIES)
        @echo $(CXX) -o $@ $(CUTOBJS)
        @$(CXX) $(CFLAGS) -pthread -o $@ $(CUTOBJS) $(CUTLIBS) $(LIBS)
        $(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(CUTADS) $(CUTADS).debuginfo)
+       $(if $(findstring -g,$(CFLAGS)),objcopy --add-gnu-debuglink=$(CUTADS).debuginfo $(CUTADS))
        $(if $(findstring -ggdb,$(CFLAGS)),,strip $(CUTADS))
 
 install-cutads:
@@ -588,6 +600,7 @@ $(OBJDIR)/%.o:              %.C
 ifneq ($(WANT_LV2),no)
 GTK2_INCS := `pkg-config --cflags gtk+-2.0` -Wno-deprecated-declarations
 GTK2_LIBS := `pkg-config --libs gtk+-2.0`
+LV2_LIBS  := `pkg-config --libs lilv-0` `pkg-config --libs suil-0`
 
 $(OBJDIR)/pluginlv2ui.o:       pluginlv2ui.C
 $(OBJDIR)/lv2ui.o:     lv2ui.C
@@ -596,7 +609,7 @@ $(OBJDIR)/pluginlv2ui.o $(OBJDIR)/lv2ui.o:
 
 $(OBJDIR)/lv2ui: $(LV2OBJS)
        @echo $(CXX) \`cat $(OBJDIR)/c_flags\` $^ -o $@
-       @$(CXX) `cat $(OBJDIR)/c_flags` $^ -o $@ $(LIBS) $(GTK2_LIBS)
+       @$(CXX) `cat $(OBJDIR)/c_flags` $^ -o $@ $(LIBS) $(LV2_LIBS) $(GTK2_LIBS)
        $(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(LV2UI) $(LV2UI).debuginfo)
        $(if $(findstring -ggdb,$(CFLAGS)),,strip $(LV2UI))