update openjpeg + x265, unproxy clip fix, config mods for lv2/opus/x265-10bit

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

diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile
index a179559ff9de5cdd335b0a81775833fe08b290a8..6abdc06385fe67266d7cc58c2800785579376ec4 100644 (file)
--- a/cinelerra-5.1/cinelerra/Makefile
+++ b/cinelerra-5.1/cinelerra/Makefile
@@ -376,7 +376,7 @@ CUTLIBS = \
 BDWRITE = $(OBJDIR)/bdwrite
 BDWOBJS = $(OBJDIR)/bdwrite.o
 
-ifneq ($(WANT_LV2UI),no)
+ifneq ($(WANT_LV2),no)
 LV2UI = $(OBJDIR)/lv2ui
 LV2OBJS = \
        $(OBJDIR)/lv2ui.o \
@@ -417,8 +417,7 @@ CFLAGS += -DUSE_ALPHA
 else
 
 LDFLAGS1 = -export-dynamic
-# avoid the intel lock elision bug, if possible
-LDFLAGS2 = $(lastword $(wildcard /usr/lib/noelision /lib/noelision /usr/lib64/noelision /lib/noelision))
+LDFLAGS2 =
 LINKER = g++ -o $(OUTPUT)
 
 endif
@@ -481,7 +480,7 @@ $(OBJDIR)/sha1.o:   sha1.C sha1.h
        $(CXX) `cat $(OBJDIR)/c_flags` -O3 -c $< -o $@
 
 #lv2
-ifneq ($(WANT_LV2UI),no)
+ifneq ($(WANT_LV2),no)
 GTK2_INCS := `pkg-config --cflags gtk+-2.0`
 GTK2_LIBS := `pkg-config --libs gtk+-2.0`