Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Borghetti <bdiego@gmail.com>2009-08-20 22:34:14 +0400
committerDiego Borghetti <bdiego@gmail.com>2009-08-20 22:34:14 +0400
commit1772a0a62f86268f01540d4a3692c2bb4c7e6432 (patch)
tree486c02d0da5c8555bf2fd84a3ae5a224c489b443 /source/nan_definitions.mk
parentf6dcd9376b2d2d0e0b126f6e12a7d83d21d81783 (diff)
Add unsigned char buffer to BLF_draw_buffer and update makefiles for lzo and lzma.
I rename the original makefile of lzo (Makefile.bak) and a new one. Also four new option for user-def.mk: WITH_LZO, default true WITH_LZMA, default true NAN_LZO, default extern/lzo NAN_LZMA, default extern/lzma It's easy add support for system libs (using lzo and lzma from OS) but I don't know if it have much sense. Note that I can't test the "unsigned char" buffer because the OGL animation is not working (right ?), but is the same code that for float also the new Makefile work fine here (Linux), but maybe need some tweak on other OS.
Diffstat (limited to 'source/nan_definitions.mk')
-rw-r--r--source/nan_definitions.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index b3f36dd3b5c..7fab61d5247 100644
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -113,7 +113,10 @@ ifndef CONFIG_GUESS
export WITH_OPENEXR ?= true
export WITH_DDS ?= true
export WITH_OPENJPEG ?= true
-
+ export WITH_LZO ?= true
+ export WITH_LZMA ?= true
+ export NAN_LZO ?= $(LCGDIR)/lzo
+ export NAN_LZMA ?= $(LCGDIR)/lzma
ifeq ($(NAN_USE_FFMPEG_CONFIG), true)
export NAN_FFMPEG ?= $(shell ffmpeg-config --prefix)