projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor fixes
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
Makefile
diff --git
a/cinelerra-5.1/cinelerra/Makefile
b/cinelerra-5.1/cinelerra/Makefile
index 3fa58be7ecb6dce9aa944df2daf60a7b4f2d2027..65df2f4a391699b9b6bfb1110fb8948c6487ccfe 100644
(file)
--- a/
cinelerra-5.1/cinelerra/Makefile
+++ b/
cinelerra-5.1/cinelerra/Makefile
@@
-133,6
+133,7
@@
OBJS := $(OVERLAYS) \
$(OBJDIR)/filebaseulaw.o \
$(OBJDIR)/filecr2.o \
$(OBJDIR)/filedv.o \
$(OBJDIR)/filebaseulaw.o \
$(OBJDIR)/filecr2.o \
$(OBJDIR)/filedv.o \
+ $(OBJDIR)/filedpx.o \
$(OBJDIR)/fileexr.o \
$(OBJDIR)/fileffmpeg.o \
$(OBJDIR)/fileflac.o \
$(OBJDIR)/fileexr.o \
$(OBJDIR)/fileffmpeg.o \
$(OBJDIR)/fileflac.o \
@@
-560,6
+561,7
@@
tags:
ctags -R -h default --langmap=c:+.inc . ../guicast/ ../libzmpeg3 ../plugins ../thirdparty/ffmpeg-*
$(OBJDIR)/fileexr.o: BFLAGS:= -Wno-deprecated -std=c++11
ctags -R -h default --langmap=c:+.inc . ../guicast/ ../libzmpeg3 ../plugins ../thirdparty/ffmpeg-*
$(OBJDIR)/fileexr.o: BFLAGS:= -Wno-deprecated -std=c++11
+$(OBJDIR)/filedpx.o: BFLAGS:= -Wno-deprecated -std=c++11
$(OBJDIR)/sha1.o: BFLAGS:= -O3
$(OVERLAYS): BFLAGS:= -Ofast -g0
$(OBJDIR)/sha1.o: BFLAGS:= -O3
$(OVERLAYS): BFLAGS:= -Ofast -g0
@@
-592,9
+594,16
@@
install: install-lv2ui
endif
ifneq ($(WANT_SHUTTLE),no)
endif
ifneq ($(WANT_SHUTTLE),no)
+X11_INCS := /usr/include/
+X11_INCS1 := $(shell pkg-config --cflags-only-I x11 | sed "s/-I//")
+
+ifneq ($(X11_INCS1),)
+X11_INCS := $(X11_INCS1)
+endif
+
$(OBJDIR)/shuttle.o: shuttle.C shuttle_keys.h
$(OBJDIR)/shuttle.o: shuttle.C shuttle_keys.h
-shuttle_keys.h:
/usr/include
/X11/keysymdef.h
- sed -n
< /usr/include
/X11/keysymdef.h > shuttle_keys.h -f shuttle.sed
+shuttle_keys.h:
$(X11_INCS)
/X11/keysymdef.h
+ sed -n
$(X11_INCS)
/X11/keysymdef.h > shuttle_keys.h -f shuttle.sed
endif
$(OBJDIR)/pluginlv2gui.o: pluginlv2gui.C
endif
$(OBJDIR)/pluginlv2gui.o: pluginlv2gui.C