diff options
| -rw-r--r-- | source/Makefile | 1 | ||||
| -rw-r--r-- | source/nan_definitions.mk | 7 | ||||
| -rw-r--r-- | source/nan_link.mk | 4 | ||||
| -rw-r--r-- | tools/Blender.py | 2 | ||||
| -rwxr-xr-x | tools/btools.py | 4 |
5 files changed, 13 insertions, 5 deletions
diff --git a/source/Makefile b/source/Makefile index ce1a6851884..cc679b2ddda 100644 --- a/source/Makefile +++ b/source/Makefile @@ -150,6 +150,7 @@ ifneq ($(NAN_NO_KETSJI),true) COMLIB += $(NAN_BULLET)/lib/libbullet.a endif COMLIB += $(NAN_GUARDEDALLOC)/lib/libguardedalloc.a + COMLIB += $(NAN_MEMUTIL)/lib/libmemutil.a COMLIB += $(NAN_BMFONT)/lib/$(DEBUG_DIR)libbmfont.a COMLIB += $(NAN_PNG)/lib/libpng.a COMLIB += $(OCGDIR)/blender/yafray/$(DEBUG_DIR)libyafrayexport.a diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index c7822683521..0dcee374058 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -105,7 +105,7 @@ endif export NAN_OPENEXR_INC ?= -I$(NAN_OPENEXR)/include -I$(NAN_OPENEXR)/include/IlmImf -I$(NAN_OPENEXR)/include/Imath -I$(NAN_OPENEXR)/include/Iex endif else - export NAN_OPENEXR ?= /usr/local + export NAN_OPENEXR ?= /usr export NAN_OPENEXR_INC ?= -I$(NAN_OPENEXR)/include -I$(NAN_OPENEXR)/include/OpenEXR export NAN_OPENEXR_LIBS ?= $(NAN_OPENEXR)/lib/libIlmImf.a $(NAN_OPENEXR)/lib/libHalf.a $(NAN_OPENEXR)/lib/libIex.a endif @@ -342,7 +342,8 @@ endif # enable freetype2 support for text objects export WITH_FREETYPE2 ?= true - + # enable ffmpeg support + export WITH_FFMPEG ?= true else ifeq ($(OS),openbsd) @@ -479,7 +480,7 @@ endif # enable freetype2 support for text objects export WITH_FREETYPE2 ?= true - + # enable quicktime support # export WITH_QUICKTIME ?= true diff --git a/source/nan_link.mk b/source/nan_link.mk index c201b79a412..16a3e3eff94 100644 --- a/source/nan_link.mk +++ b/source/nan_link.mk @@ -47,7 +47,7 @@ endif ######################## OS dependencies (alphabetic!) ################ - # default (overriden by windows) +# default (overriden by windows) SOEXT = .so ifeq ($(OS),beos) @@ -100,7 +100,7 @@ ifeq ($(OS),linux) ifeq ($(CPU),$(findstring $(CPU), "i386 x86_64 ia64")) COMMENT = "MESA 3.1" LLIBS = -L$(NAN_MESA)/lib -L/usr/X11R6/lib -lXmu -lXext -lX11 -lXi - LLIBS += -lutil -lc -lm -ldl -lpthread + LLIBS += -lutil -lc -lm -ldl -lpthread -lopenal -lavformat -lavcodec -lavutil -ldts -lz # LLIBS += -L$(NAN_ODE)/lib -lode LOPTS = -export-dynamic DADD = -lGL -lGLU diff --git a/tools/Blender.py b/tools/Blender.py index 27365f4aab4..377e96f3d76 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -139,6 +139,8 @@ def setup_syslibs(lenv): syslibs += Split(lenv['BF_ICONV_LIB']) if lenv['WITH_BF_OPENEXR']: syslibs += Split(lenv['BF_OPENEXR_LIB']) + if lenv['WITH_BF_FFMPEG']: + syslibs += Split(lenv['BF_FFMPEG_LIB']) syslibs += Split(lenv['BF_SDL_LIB']) syslibs += Split(lenv['BF_OPENGL_LIB']) syslibs += Split(lenv['LLIBS']) diff --git a/tools/btools.py b/tools/btools.py index 6dfbc792a85..8a9f08e5f22 100755 --- a/tools/btools.py +++ b/tools/btools.py @@ -20,6 +20,7 @@ def validate_arguments(args, bc): 'WITH_BF_SDL', 'BF_SDL', 'BF_SDL_INC', 'BF_SDL_LIB', 'BF_SDL_LIBPATH', 'WITH_BF_FMOD', 'WITH_BF_OPENEXR', 'BF_OPENEXR', 'BF_OPENEXR_INC', 'BF_OPENEXR_LIB', 'BF_OPENEXR_LIBPATH', + 'WITH_BF_FFMPEG', 'BF_FFMPEG_LIB', 'WITH_BF_JPEG', 'BF_JPEG', 'BF_JPEG_INC', 'BF_JPEG_LIB', 'BF_JPEG_LIBPATH', 'WITH_BF_PNG', 'BF_PNG', 'BF_PNG_INC', 'BF_PNG_LIB', 'BF_PNG_LIBPATH', 'BF_TIFF', 'BF_TIFF_INC', @@ -137,6 +138,9 @@ def read_opts(cfg, args): ('BF_OPENEXR_LIB', 'OPENEXR library', ''), ('BF_OPENEXR_LIBPATH', 'OPENEXR library path', ''), + (BoolOption('WITH_BF_FFMPEG', 'Use FFMPEG if true', 'false')), + ('BF_FFMPEG_LIB', 'FFMPEG library', ''), + (BoolOption('WITH_BF_JPEG', 'Use JPEG if true', 'true')), ('BF_JPEG', 'JPEG base path', ''), ('BF_JPEG_INC', 'JPEG include path', ''), |