diff options
| author | Diego Borghetti <bdiego@gmail.com> | 2009-08-20 22:34:14 +0400 |
|---|---|---|
| committer | Diego Borghetti <bdiego@gmail.com> | 2009-08-20 22:34:14 +0400 |
| commit | 1772a0a62f86268f01540d4a3692c2bb4c7e6432 (patch) | |
| tree | 486c02d0da5c8555bf2fd84a3ae5a224c489b443 /source/blender/blenkernel/intern/Makefile | |
| parent | f6dcd9376b2d2d0e0b126f6e12a7d83d21d81783 (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/blender/blenkernel/intern/Makefile')
| -rw-r--r-- | source/blender/blenkernel/intern/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/Makefile b/source/blender/blenkernel/intern/Makefile index d6d41d6579e..6c2edc9e25f 100644 --- a/source/blender/blenkernel/intern/Makefile +++ b/source/blender/blenkernel/intern/Makefile @@ -90,6 +90,10 @@ CPPFLAGS += -I$(NAN_BULLET2)/include CPPFLAGS += -I$(NAN_FREETYPE)/include CPPFLAGS += -I$(NAN_FREETYPE)/include/freetype2 +# lzo and lzma, for pointcache +CPPFLAGS += -I$(NAN_LZO)/minilzo +CPPFLAGS += -I$(NAN_LZMA) + ifeq ($(WITH_FFMPEG),true) CPPFLAGS += -DWITH_FFMPEG CPPFLAGS += $(NAN_FFMPEGCFLAGS) @@ -111,3 +115,4 @@ ifeq ($(WITH_QUICKTIME), true) CPPFLAGS += -I../../quicktime CPPFLAGS += -DWITH_QUICKTIME endif + |