X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2FMakefile;h=18590e3a99095c45e628328959ded3b14f0667be;hb=6853a2c0b04cc5ff4e87a2022c914227f925cb7f;hp=6abdc06385fe67266d7cc58c2800785579376ec4;hpb=114b45040c8027671cbe50e7d6cecb28bf73b35f;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile
index 6abdc063..18590e3a 100644
--- a/cinelerra-5.1/cinelerra/Makefile
+++ b/cinelerra-5.1/cinelerra/Makefile
@@ -1,7 +1,7 @@
 export TOPDIR ?= $(CURDIR)/..
 include $(TOPDIR)/global_config
 
-OBJS = \
+OBJS := \
 	$(OBJDIR)/aattachmentpoint.o \
 	$(OBJDIR)/aautomation.o \
 	$(OBJDIR)/aboutprefs.o \
@@ -30,7 +30,6 @@ OBJS = \
 	$(OBJDIR)/audiodvb.o \
 	$(OBJDIR)/audioesound.o \
 	$(OBJDIR)/audioidevice.o \
-	$(OBJDIR)/audiompeg.o \
 	$(OBJDIR)/audioodevice.o \
 	$(OBJDIR)/audiooss.o \
 	$(OBJDIR)/audiov4l2mpeg.o \
@@ -63,7 +62,6 @@ OBJS = \
 	$(OBJDIR)/clipedls.o \
 	$(OBJDIR)/clippopup.o \
 	$(OBJDIR)/colorpicker.o \
-	$(OBJDIR)/commercials.o \
 	$(OBJDIR)/commonrender.o \
 	$(OBJDIR)/confirmquit.o \
 	$(OBJDIR)/confirmsave.o \
@@ -75,18 +73,15 @@ OBJS = \
 	$(OBJDIR)/cwindowgui.o \
 	$(OBJDIR)/cwindow.o \
 	$(OBJDIR)/cwindowtool.o \
-	$(OBJDIR)/dbwindow.o \
 	$(OBJDIR)/dcoffset.o \
 	$(OBJDIR)/deleteallindexes.o \
 	$(OBJDIR)/device1394input.o \
 	$(OBJDIR)/device1394output.o \
 	$(OBJDIR)/devicedvbinput.o \
-	$(OBJDIR)/devicempeginput.o \
 	$(OBJDIR)/devicev4l2base.o \
 	$(OBJDIR)/devicev4l2input.o \
 	$(OBJDIR)/dragcheckbox.o \
 	$(OBJDIR)/drivesync.o \
-	$(OBJDIR)/dvbtune.o \
 	$(OBJDIR)/dvdcreate.o \
 	$(OBJDIR)/edithandles.o \
 	$(OBJDIR)/editlength.o \
@@ -100,12 +95,10 @@ OBJS = \
 	$(OBJDIR)/exportedl.o \
 	$(OBJDIR)/fadeengine.o \
 	$(OBJDIR)/ffmpeg.o \
-	$(OBJDIR)/fileac3.o \
 	$(OBJDIR)/filebaseaudio.o \
 	$(OBJDIR)/filebase.o \
 	$(OBJDIR)/filebaseulaw.o \
 	$(OBJDIR)/filecr2.o \
-	$(OBJDIR)/filedb.o \
 	$(OBJDIR)/filedv.o \
 	$(OBJDIR)/fileexr.o \
 	$(OBJDIR)/fileffmpeg.o \
@@ -114,7 +107,6 @@ OBJS = \
 	$(OBJDIR)/filegif.o \
 	$(OBJDIR)/filejpeg.o \
 	$(OBJDIR)/filelist.o \
-	$(OBJDIR)/filempeg.o \
 	$(OBJDIR)/file.o \
 	$(OBJDIR)/fileogg.o \
 	$(OBJDIR)/filepng.o \
@@ -180,7 +172,6 @@ OBJS = \
 	$(OBJDIR)/maskautos.o \
 	$(OBJDIR)/maskengine.o \
 	$(OBJDIR)/mbuttons.o \
-	$(OBJDIR)/mediadb.o \
 	$(OBJDIR)/menuaeffects.o \
 	$(OBJDIR)/menuattacheffect.o \
 	$(OBJDIR)/menuattachtransition.o \
@@ -310,7 +301,6 @@ OBJS = \
 	$(OBJDIR)/vdevice1394.o \
 	$(OBJDIR)/vdevicebase.o \
 	$(OBJDIR)/vdevicedvb.o \
-	$(OBJDIR)/vdevicempeg.o \
 	$(OBJDIR)/vdeviceprefs.o \
 	$(OBJDIR)/vdevicev4l2jpeg.o \
 	$(OBJDIR)/vdevicev4l2mpeg.o \
@@ -345,6 +335,29 @@ OBJS = \
 	$(OBJDIR)/zwindow.o \
 	$(OBJDIR)/zwindowgui.o \
 
+ifneq ($(WANT_LIBZMPEG),no)
+OBJS += \
+	$(OBJDIR)/audiompeg.o \
+	$(OBJDIR)/devicempeginput.o \
+	$(OBJDIR)/filempeg.o \
+	$(OBJDIR)/vdevicempeg.o \
+
+endif
+ifneq ($(WANT_COMMERCIAL),no)
+OBJS += \
+	$(OBJDIR)/commercials.o \
+	$(OBJDIR)/dbwindow.o \
+	$(OBJDIR)/filedb.o \
+	$(OBJDIR)/mediadb.o \
+
+endif
+ifneq ($(WANT_CIN_3RDPARTY),no)
+OBJS += \
+	$(OBJDIR)/fileac3.o \
+
+endif
+
+#	$(OBJDIR)/dvbtune.o \
 #	$(OBJDIR)/renderfarmfsclient.o \
 #	$(OBJDIR)/renderfarmfsserver.o \
 
@@ -357,13 +370,88 @@ OUTPUT_G = $(OBJDIR)/$(WANT_CIN).debuginfo
 
 LIBRARIES := \
 	$(GUICAST)/$(OBJDIR)/libguicast.a \
-	$(LIBZMPEG3)/$(OBJDIR)/libzmpeg3.a \
+
+ifneq ($(WANT_LIBZMPEG),no)
+LIBRARIES += \
 	$(MPEG2ENC)/$(OBJDIR)/hveg2enc.a \
+	$(LIBZMPEG3)/$(OBJDIR)/libzmpeg3.a \
+
+endif
+ifneq ($(WANT_COMMERCIAL),no)
+LIBRARIES += \
 	$(TDB)/$(OBJDIR)/db.a \
 
+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
+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
+endif
 
+ifneq ($(WANT_COMMERCIAL),no)
 CUTADS = $(OBJDIR)/cutads
 CUTOBJ = $(OBJDIR)/cutads.o
 CUTOBJS = $(CUTOBJ) \
@@ -372,6 +460,7 @@ CUTOBJS = $(CUTOBJ) \
 CUTLIBS = \
 	$(LIBZMPEG3)/$(OBJDIR)/libzmpeg3.a -lX11 \
 	$(TDB)/$(OBJDIR)/db.a
+endif
 
 BDWRITE = $(OBJDIR)/bdwrite
 BDWOBJS = $(OBJDIR)/bdwrite.o
@@ -416,9 +505,9 @@ CFLAGS += -DUSE_ALPHA
 
 else
 
-LDFLAGS1 = -export-dynamic
+LDFLAGS1 = -Wl,-export-dynamic -g
 LDFLAGS2 =
-LINKER = g++ -o $(OUTPUT)
+LINKER = $(CXX) -o $(OUTPUT)
 
 endif
 
@@ -437,6 +526,7 @@ $(OUTPUT): $(OBJS) $(THEME_DATA) $(DCRAW) $(LIBRARIES)
 	$(if $(findstring -ggdb,$(CFLAGS)),,strip $(OUTPUT))
 	ln -f -s ../bin/$(WANT_CIN) ci
 
+ifneq ($(WANT_COMMERCIAL),no)
 $(CUTADS):	$(CUTOBJS) $(CUTLIBS) $(LIBRARIES)
 	@echo g++ -o $@ $(CUTOBJS)
 	@g++ $(CFLAGS) -pthread -o $@ $(CUTOBJS) $(CUTLIBS) $(LIBS)
@@ -445,7 +535,9 @@ $(CUTADS):	$(CUTOBJS) $(CUTLIBS) $(LIBRARIES)
 
 install-cutads:
 	cp -av $(OBJDIR)/cutads $(BINDIR)/.
+
 install:	install-cutads
+endif
 
 $(BDWRITE):	$(BDWOBJS) $(LIBRARIES)
 	@echo g++ -o $@ $(BDWOBJS)
@@ -500,6 +592,7 @@ lv2ui:	$(LV2UI)
 
 install-lv2ui:
 	cp -av $(LV2UI) $(BINDIR)/.
+
 install:	install-lv2ui
 endif