X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2FMakefile;h=81d1aceefd0027e05de04267e48fe738a7a2b6a2;hp=43c66e8fb934e2ebf5721c5928c21bb407d31fef;hb=1db0dacec8f9d7f5687e582bd282d9bf83bd58f0;hpb=e51e8d64881ef494548697203c82e5be8646cd4b

diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile
index 43c66e8f..81d1acee 100644
--- a/cinelerra-5.1/cinelerra/Makefile
+++ b/cinelerra-5.1/cinelerra/Makefile
@@ -1,7 +1,39 @@
 export TOPDIR ?= $(CURDIR)/..
 include $(TOPDIR)/global_config
 
-OBJS := \
+OVERLAYS := \
+	$(OBJDIR)/overlay_direct_rgb161616.o \
+	$(OBJDIR)/overlay_direct_rgb888.o \
+	$(OBJDIR)/overlay_direct_rgba16161616.o \
+	$(OBJDIR)/overlay_direct_rgba8888.o \
+	$(OBJDIR)/overlay_direct_rgba_float.o \
+	$(OBJDIR)/overlay_direct_rgb_float.o \
+	$(OBJDIR)/overlay_direct_yuv161616.o \
+	$(OBJDIR)/overlay_direct_yuv888.o \
+	$(OBJDIR)/overlay_direct_yuva16161616.o \
+	$(OBJDIR)/overlay_direct_yuva8888.o \
+	$(OBJDIR)/overlay_nearest_rgb161616.o \
+	$(OBJDIR)/overlay_nearest_rgb888.o \
+	$(OBJDIR)/overlay_nearest_rgba16161616.o \
+	$(OBJDIR)/overlay_nearest_rgba8888.o \
+	$(OBJDIR)/overlay_nearest_rgba_float.o \
+	$(OBJDIR)/overlay_nearest_rgb_float.o \
+	$(OBJDIR)/overlay_nearest_yuv161616.o \
+	$(OBJDIR)/overlay_nearest_yuv888.o \
+	$(OBJDIR)/overlay_nearest_yuva16161616.o \
+	$(OBJDIR)/overlay_nearest_yuva8888.o \
+	$(OBJDIR)/overlay_sample_rgb161616.o \
+	$(OBJDIR)/overlay_sample_rgb888.o \
+	$(OBJDIR)/overlay_sample_rgba16161616.o \
+	$(OBJDIR)/overlay_sample_rgba8888.o \
+	$(OBJDIR)/overlay_sample_rgba_float.o \
+	$(OBJDIR)/overlay_sample_rgb_float.o \
+	$(OBJDIR)/overlay_sample_yuv161616.o \
+	$(OBJDIR)/overlay_sample_yuv888.o \
+	$(OBJDIR)/overlay_sample_yuva16161616.o \
+	$(OBJDIR)/overlay_sample_yuva8888.o \
+
+OBJS := $(OVERLAYS) \
 	$(OBJDIR)/aattachmentpoint.o \
 	$(OBJDIR)/aautomation.o \
 	$(OBJDIR)/aboutprefs.o \
@@ -32,6 +64,7 @@ OBJS := \
 	$(OBJDIR)/audioidevice.o \
 	$(OBJDIR)/audioodevice.o \
 	$(OBJDIR)/audiooss.o \
+	$(OBJDIR)/audiopulse.o \
 	$(OBJDIR)/audiov4l2mpeg.o \
 	$(OBJDIR)/autoconf.o \
 	$(OBJDIR)/automation.o \
@@ -46,6 +79,7 @@ OBJS := \
 	$(OBJDIR)/bdcreate.o \
 	$(OBJDIR)/binfolder.o \
 	$(OBJDIR)/bitspopup.o \
+	$(OBJDIR)/boxblur.o \
 	$(OBJDIR)/brender.o \
 	$(OBJDIR)/browsebutton.o \
 	$(OBJDIR)/byteorderpopup.o \
@@ -64,8 +98,10 @@ OBJS := \
 	$(OBJDIR)/clippopup.o \
 	$(OBJDIR)/colorpicker.o \
 	$(OBJDIR)/commonrender.o \
+	$(OBJDIR)/compressortools.o \
 	$(OBJDIR)/confirmquit.o \
 	$(OBJDIR)/confirmsave.o \
+	$(OBJDIR)/convert.o \
 	$(OBJDIR)/cpanel.o \
 	$(OBJDIR)/cplayback.o \
 	$(OBJDIR)/ctimebar.o \
@@ -93,6 +129,7 @@ OBJS := \
 	$(OBJDIR)/edl.o \
 	$(OBJDIR)/edlsession.o \
 	$(OBJDIR)/effectlist.o \
+	$(OBJDIR)/eqcanvas.o \
 	$(OBJDIR)/exportedl.o \
 	$(OBJDIR)/fadeengine.o \
 	$(OBJDIR)/ffmpeg.o \
@@ -112,6 +149,7 @@ OBJS := \
 	$(OBJDIR)/fileogg.o \
 	$(OBJDIR)/filepng.o \
 	$(OBJDIR)/fileppm.o \
+	$(OBJDIR)/fileref.o \
 	$(OBJDIR)/filescene.o \
 	$(OBJDIR)/filesndfile.o \
 	$(OBJDIR)/filetga.o \
@@ -182,6 +220,7 @@ OBJS := \
 	$(OBJDIR)/menuveffects.o \
 	$(OBJDIR)/meterhistory.o \
 	$(OBJDIR)/meterpanel.o \
+	$(OBJDIR)/mixersalign.o \
 	$(OBJDIR)/module.o \
 	$(OBJDIR)/mtimebar.o \
 	$(OBJDIR)/mwindowedit.o \
@@ -189,8 +228,8 @@ OBJS := \
 	$(OBJDIR)/mwindowmove.o \
 	$(OBJDIR)/mwindow.o \
 	$(OBJDIR)/new.o \
-	$(OBJDIR)/overlaydirect.o \
 	$(OBJDIR)/overlayframe.o \
+	$(OBJDIR)/overlaydirect.o \
 	$(OBJDIR)/overlaynearest.o \
 	$(OBJDIR)/overlaysample.o \
 	$(OBJDIR)/packagedispatcher.o \
@@ -271,6 +310,7 @@ OBJS := \
 	$(OBJDIR)/sharedlocation.o \
 	$(OBJDIR)/shbtnprefs.o \
 	$(OBJDIR)/shmemory.o \
+	$(OBJDIR)/shuttle.o \
 	$(OBJDIR)/sighandler.o \
 	$(OBJDIR)/signalstatus.o \
 	$(OBJDIR)/splashgui.o \
@@ -330,7 +370,9 @@ OBJS := \
 	$(OBJDIR)/vwindowgui.o \
 	$(OBJDIR)/vwindow.o \
 	$(OBJDIR)/wavecache.o \
+	$(OBJDIR)/wintv.o \
 	$(OBJDIR)/wwindow.o \
+	$(OBJDIR)/x10tv.o \
 	$(OBJDIR)/zoombar.o \
 	$(OBJDIR)/zoompanel.o \
 	$(OBJDIR)/zwindow.o \
@@ -386,70 +428,16 @@ endif
 
 LIBS := $(LIBRARIES)
 
-ifneq ($(WANT_CIN_3RDPARTY),no)
-LIBS += $(libraries)
-else
-
-LIBS += -lpthread -lm -lbz2 -llzma -lz -lpng -luuid
-LIBS += -lX11 -lXau -lXdmcp -lXext -lXfixes -lXv -lXinerama
-LIBS += -lfontconfig -lfreetype
-LIBS += -lavcodec -lavdevice -lavfilter -lavformat -lavresample -lavutil
+ifeq ($(WANT_CIN_3RDPARTY),no)
+LIBS += -lavcodec -lavdevice -lavfilter -lavformat -lavutil
 LIBS += -lswresample -lswscale
-LIBS += -lvpx -lwebp -lwebpmux
-
-LIBS += $(if $(filter fftw,$(static_pkgs)), -lfftw3)
-LIBS += $(if $(filter flac,$(static_pkgs)), -lFLAC)
-LIBS += $(if $(filter giflib,$(static_pkgs)), -lgif)
-LIBS += $(if $(filter lame,$(static_pkgs)), -lmp3lame)
-LIBS += $(if $(filter libjpeg,$(static_pkgs)), -ljpeg)
-LIBS += $(if $(filter openjpeg,$(static_pkgs)), -lopenjp2)
-LIBS += $(if $(filter libogg,$(static_pkgs)), -logg)
-LIBS += $(if $(filter libsndfile,$(static_pkgs)), -lsndfile)
-LIBS += $(if $(filter libtheora,$(static_pkgs)), -ltheoradec -ltheoraenc)
-LIBS += $(if $(filter libuuid,$(static_pkgs)), -luuid)
-LIBS += $(if $(filter libvorbis,$(static_pkgs)), -lvorbis -lvorbisenc -lvorbisfile)
-LIBS += $(if $(filter tiff,$(static_pkgs)), -ltiff)
-LIBS += $(if $(filter twolame,$(static_pkgs)), -ltwolame)
-LIBS += $(if $(filter x264,$(static_pkgs)), -lx264)
-LIBS += $(if $(filter x265,$(static_pkgs)), -lx265)
-LIBS += $(if $(filter libvpx,$(static_pkgs)), -lvpx)
-
-ifneq ($(WANT_GL),no)
-LIBS += -lGL -lGLU -lGLX
-endif
-ifneq ($(WANT_XFT),no)
-LIBS += -lXft
-endif
-ifneq ($(WANT_ALSA),no)
-LIBS += -lasound
-endif
-ifneq ($(WANT_OPENEXR),no)
-LIBS += -lIex -lIexMath -lIlmImf -lIlmImfUtil
-endif
-ifneq ($(WANT_DV),no)
-LIBS += -ldv
-endif
-ifneq ($(WANT_FIREWIRE),no)
-LIBS += -lavc1394 -lraw1394 -liec61883 -lrom1394
-endif
-ifneq ($(WANT_DVB),no)
-LIBS += -ldv
-endif
-ifneq ($(WANT_DL),no)
-LIBS += -ldl
-endif
-ifneq ($(WANT_LIBZMPEG),no)
-LIBS += -lmjpegutils
-endif
-ifneq ($(WANT_OPUS),no)
-LIBS += -lopus
-endif
-ifneq ($(WANT_NUMA),no)
-LIBS += -lnuma
-endif
-ifneq ($(WANT_LV2),no)
-LIBS += -llilv-0 -lsratom-0 -lserd-0 -lsord-0 -lsuil-0
-endif
+LIBS += -lintl -liconv
+LIBS += -lexecinfo
+
+LIBS += $(shared_libs)
+LIBS += $(system_libs)
+else
+LIBS += $(libraries)
 endif
 
 ifneq ($(WANT_COMMERCIAL),no)
@@ -477,6 +465,7 @@ LV2OBJS = \
 endif
 
 CFLAGS := \
+	-I/usr/local/include \
 	-I$(GUICAST) \
 	-I$(LIBZMPEG3) \
 	$(static_incs) \
@@ -529,8 +518,8 @@ $(OUTPUT): $(OBJS) $(THEME_DATA) $(DCRAW) $(LIBRARIES)
 
 ifneq ($(WANT_COMMERCIAL),no)
 $(CUTADS):	$(CUTOBJS) $(CUTLIBS) $(LIBRARIES)
-	@echo g++ -o $@ $(CUTOBJS)
-	@g++ $(CFLAGS) -pthread -o $@ $(CUTOBJS) $(CUTLIBS) $(LIBS)
+	@echo $(CXX) -o $@ $(CUTOBJS)
+	@$(CXX) $(CFLAGS) -pthread -o $@ $(CUTOBJS) $(CUTLIBS) $(LIBS)
 	$(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(CUTADS) $(CUTADS).debuginfo)
 	$(if $(findstring -ggdb,$(CFLAGS)),,strip $(CUTADS))
 
@@ -541,8 +530,8 @@ install:	install-cutads
 endif
 
 $(BDWRITE):	$(BDWOBJS) $(LIBRARIES)
-	@echo g++ -o $@ $(BDWOBJS)
-	@g++ $(CFLAGS) -pthread -o $@ $(BDWOBJS) $(LIBS)
+	@echo $(CXX) -o $@ $(BDWOBJS)
+	@$(CXX) $(CFLAGS) -pthread -o $@ $(BDWOBJS) $(LIBS)
 	$(if $(findstring -g,$(CFLAGS)),objcopy --only-keep-debug $(BDWRITE) $(BDWRITE).debuginfo)
 	$(if $(findstring -ggdb,$(CFLAGS)),,strip $(BDWRITE))
 
@@ -551,30 +540,31 @@ install-bdwrite:
 install:	install-bdwrite
 
 ydiff:	ydiff.C $(LIBRARIES)
-	@echo g++ -o $@ ydiff.C
-	@g++ $(CFLAGS) ydiff.C -o $@ $(LIBS)
+	@echo $(CXX) -o $@ ydiff.C
+	@$(CXX) $(CFLAGS) ydiff.C -o $@ $(LIBS)
+
+shdmp:	shdmp.C
+	@$(CXX) $(CFLAGS) shdmp.C -o $@
+shudmp:	shudmp.C
+	@$(CXX) $(CFLAGS) shudmp.C -o $@ -lusb-1.0
 
 clean:
 	rm -rf $(OBJDIR)
-
+	rm -f shuttle_keys.h
 
 tags:
 	ctags -R -h default --langmap=c:+.inc . ../guicast/ ../libzmpeg3 ../plugins ../thirdparty/ffmpeg-*
 
+$(OBJDIR)/fileexr.o:	BFLAGS:= -Wno-deprecated -std=c++11
+$(OBJDIR)/sha1.o:	BFLAGS:= -O3
+$(OVERLAYS):		BFLAGS:= -Ofast -g0
 
 $(OBJDIR)/%.o:		%.C
-	$(CXX) `cat $(OBJDIR)/c_flags` -DMSGQUAL=$* -c $< -o $@
-
-
-$(OBJDIR)/fileexr.o:	fileexr.C
-	$(CXX) `cat $(OBJDIR)/c_flags` -Wno-deprecated -DMSGQUAL=$* -c $< -o $@
-
-$(OBJDIR)/sha1.o:	sha1.C sha1.h
-	$(CXX) `cat $(OBJDIR)/c_flags` -O3 -c $< -o $@
+	$(CXX) `cat $(OBJDIR)/c_flags` $(BFLAGS) -DMSGQUAL=$* -c $< -o $@
 
 #lv2
 ifneq ($(WANT_LV2),no)
-GTK2_INCS := `pkg-config --cflags gtk+-2.0`
+GTK2_INCS := `pkg-config --cflags gtk+-2.0` -Wno-deprecated-declarations
 GTK2_LIBS := `pkg-config --libs gtk+-2.0`
 
 $(OBJDIR)/pluginlv2ui.o:	pluginlv2ui.C
@@ -597,6 +587,12 @@ install-lv2ui:
 install:	install-lv2ui
 endif
 
+ifneq ($(WANT_SHUTTLE),no)
+$(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
+endif
+
 $(OBJDIR)/pluginlv2gui.o:	pluginlv2gui.C
 	$(CXX) `cat $(OBJDIR)/c_flags` $(GTK2_INCS) -DMSGQUAL=$* -c $< -o $@