X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fglobal_config;h=43126b32c26e6046886ec168176baab255b7cb9d;hb=69846fe5913069496f392998feba71847299e3df;hp=9f6cba680ba52fc9309dd08edcd743380c66b3d7;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/global_config b/cinelerra-5.1/global_config
index 9f6cba68..43126b32 100644
--- a/cinelerra-5.1/global_config
+++ b/cinelerra-5.1/global_config
@@ -1,17 +1,25 @@
 SHELL := /bin/bash
 
+# not probed
 HAVE_ALSA := y
-HAVE_DVB := y
+HAVE_DV := y
 HAVE_ESOUND := y
 HAVE_FIREWIRE := y
 HAVE_OSS := y
 HAVE_XFT := y
 HAVE_VIDEO4LINUX := n
-HAVE_VIDEO4LINUX2 := y
+# build thirdparty ladspa
+HAVE_LADSPA := y
 
-STATIC_LIBRARIES := y
+# probed, uncomment and set to override probe
+#STATIC_LIBRARIES := y
+#HAVE_VIDEO4LINUX2 := y
+#HAVE_DVB := y
+#HAVE_GL := y
+#HAVE_DL := y
+#HAVE_NUMA := y
 
-OBJDIR := $(shell uname --machine)
+OBJDIR := $(shell uname -m)
 
 GLOBAL_CONFIG := $(lastword $(wildcard ./global_config ../global_config ../../global_config))
 TOPDIR := $(dir $(GLOBAL_CONFIG))
@@ -20,14 +28,6 @@ PLUGIN_DIR := $(BINDIR)/plugins
 # abs path
 THIRDPARTY := $(shell cd $(TOPDIR)/thirdparty; pwd)
 
-ifneq (,$(findstring HAVE_GL,$(shell cat $(GLOBAL_CONFIG))))
-HAVE_GL := y
-else
-HAVE_GL := n
-endif
-
-
-
 ifeq ($(origin CFLAGS), environment)
 HAVE_CFLAGS := y
 else
@@ -35,16 +35,10 @@ HAVE_CFLAGS := n
 endif
 
 
-############################# C++ and C COMPILERS
-
-############################# FINAL DESTINATION FOR INSTALLATION BINARIES
-
 PREFIX = /usr/
 LIBPREFIX = $(PREFIX)/lib
 
 
-########################## THE COMPILER
-
 CC = g++
 GCC = gcc
 
@@ -63,10 +57,7 @@ CFLAGS += -DHAVE_XFT
 endif
 
 ifeq ($(HAVE_ESOUND), y)
-ESOUND_DIR := $(THIRDPARTY)/esound
-AUDIOFILE_DIR := $(THIRDPARTY)/audiofile
-ESOUNDCFLAGS = -DHAVE_ESOUND -I$(ESOUND_DIR) -I$(AUDIOFILE_DIR)
-ESOUNDLIBS = $(ESOUND_DIR)/$(OBJDIR)/libesound.a
+CFLAGS += -DHAVE_ESOUND
 endif
 
 #CFLAGS += -g
@@ -76,7 +67,6 @@ CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 #FREETYPE_DIR := $(shell expr $(THIRDPARTY)/freetype-* )
 FREETYPE_DIR := $(shell pkg-config --cflags freetype2 )
 CFLAGS += $(FREETYPE_DIR) -I$(TOPDIR)
-CFLAGS += -DHAVE_VIDEO4LINUX2
 
 ifeq ($(HAVE_ALSA), y)
 CFLAGS += $(ALSA_CFLAGS)
@@ -102,23 +92,39 @@ ifeq ($(HAVE_VIDEO4LINUX2), y)
 CFLAGS += -DHAVE_VIDEO4LINUX2
 endif
 
+ifeq ($(HAVE_DV), y)
+CFLAGS += -DHAVE_DV
+endif
+
 ifeq ($(OBJDIR), alpha)
 CXXREPOSITORY = cxx_repository/*.o
 endif
 
 $(shell mkdir -p $(OBJDIR) )
 
-########################## LINKER
 
 LFLAGS = 
 LDLINKER = g++ -shared 
 
 
-############### MAKEFILE MACROS
-
 LOOP_BEGIN = @ for i in $(DIRS) ; \
 	do \
 	
 
 LOOP_END = done
 
+#EXTRA_LIBS += -L/usr/local/lib
+#CPATH = /usr/local/include
+
+ifeq ($(HAVE_DL), y)
+EXTRA_LIBS += -ldl
+EXTRA_FFMPEG_CFG += --extra-ldflags="-ldl"
+endif
+
+ifeq ($(HAVE_NUMA), y)
+EXTRA_LIBS += -lnuma
+endif
+
+CFLAGS += -D__STDC_CONSTANT_MACROS
+CFLAGS += -D__STDC_LIMIT_MACROS
+CFLAGS += -DPNG_SKIP_SETJMP_CHECK=1