[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22662] branches/blender2.5/blender: Add unsigned char buffer to BLF_draw_buffer and update makefiles for lzo and lzma .
Diego Borghetti
bdiego at gmail.com
Thu Aug 20 20:34:14 CEST 2009
Revision: 22662
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22662
Author: bdiego
Date: 2009-08-20 20:34:14 +0200 (Thu, 20 Aug 2009)
Log Message:
-----------
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.
Modified Paths:
--------------
branches/blender2.5/blender/extern/Makefile
branches/blender2.5/blender/extern/lzo/minilzo/Makefile
branches/blender2.5/blender/source/Makefile
branches/blender2.5/blender/source/blender/blenfont/intern/blf_font.c
branches/blender2.5/blender/source/blender/blenkernel/intern/Makefile
branches/blender2.5/blender/source/nan_definitions.mk
Added Paths:
-----------
branches/blender2.5/blender/extern/lzma/Makefile
branches/blender2.5/blender/extern/lzo/minilzo/Makefile.bak
Modified: branches/blender2.5/blender/extern/Makefile
===================================================================
--- branches/blender2.5/blender/extern/Makefile 2009-08-20 17:59:37 UTC (rev 22661)
+++ branches/blender2.5/blender/extern/Makefile 2009-08-20 18:34:14 UTC (rev 22662)
@@ -54,6 +54,14 @@
DIRS += libopenjpeg
endif
+ifeq ($(WITH_LZO), true)
+ DIRS += lzo/minilzo
+endif
+
+ifeq ($(WITH_LZMA), true)
+ DIRS += lzma
+endif
+
TARGET = solid
all::
Added: branches/blender2.5/blender/extern/lzma/Makefile
===================================================================
--- branches/blender2.5/blender/extern/lzma/Makefile (rev 0)
+++ branches/blender2.5/blender/extern/lzma/Makefile 2009-08-20 18:34:14 UTC (rev 22662)
@@ -0,0 +1,46 @@
+#
+# $Id$
+#
+# ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version. The Blender
+# Foundation also sells licenses for use in proprietary software under
+# the Blender License. See http://www.blender.org/BL/ for information
+# about this.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s):
+#
+# ***** END GPL/BL DUAL LICENSE BLOCK *****
+#
+#
+
+LIBNAME = lzma
+DIR = $(OCGDIR)/extern/$(LIBNAME)
+
+include nan_compile.mk
+
+install: $(ALL_OR_DEBUG)
+ @[ -d $(NAN_LZMA) ] || mkdir -p $(NAN_LZMA)
+ @[ -d $(NAN_LZMA)/lib/$(DEBUG_DIR) ] || mkdir -p $(NAN_LZMA)/lib/$(DEBUG_DIR)
+ @$(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)lib$(LIBNAME).a $(NAN_LZMA)/lib/$(DEBUG_DIR)
+ifeq ($(OS),darwin)
+ ranlib $(NAN_LZMA)/lib/$(DEBUG_DIR)lib$(LIBNAME).a
+endif
+ @$(NANBLENDERHOME)/intern/tools/cpifdiff.sh *.h $(NAN_LZMA)
Modified: branches/blender2.5/blender/extern/lzo/minilzo/Makefile
===================================================================
--- branches/blender2.5/blender/extern/lzo/minilzo/Makefile 2009-08-20 17:59:37 UTC (rev 22661)
+++ branches/blender2.5/blender/extern/lzo/minilzo/Makefile 2009-08-20 18:34:14 UTC (rev 22662)
@@ -1,113 +1,40 @@
#
-# a very simple Makefile for miniLZO
+# $Id:
#
-# Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
+# ***** BEGIN GPL LICENSE BLOCK *****
#
-
-PROGRAM = testmini
-SOURCES = testmini.c minilzo.c
-
-default:
- @echo "Please choose one of the following targets:"
- @echo " gcc: gcc"
- @echo " unix: hpux hpux9"
- @echo " win32: win32-bc win32-cygwin win32-dm win32-lccwin32"
- @echo " win32-intelc win32-mingw win32-vc win32-watcomc"
- @echo " dos16: dos16-bc dos16-mc dos16-wc"
- @echo " dos32: dos32-djgpp2 dos32-wc"
-
-
-# Make sure that minilzo.h, lzoconf.h and lzodefs.h are in the
-# current dircectory. Otherwise you may want to adjust CPPFLAGS.
-##CPPFLAGS = -I../include/lzo -I.
-
-GCC_CFLAGS = -s -Wall -O2 -fomit-frame-pointer
-
-
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
-# gcc (generic)
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-
-gcc:
- gcc $(CPPFLAGS) $(GCC_CFLAGS) -o $(PROGRAM) $(SOURCES)
-
-cc:
- cc $(CPPFLAGS) -o $(PROGRAM) $(SOURCES)
-
-
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-# UNIX
+# The Original Code is Copyright (C) 2009 Blender Foundation
+# All rights reserved.
#
-
-hpux:
- cc -Ae $(CPPFLAGS) -o $(PROGRAM) $(SOURCES)
-
-hpux9:
- cc -Aa -D_HPUX_SOURCE $(CPPFLAGS) -o $(PROGRAM) $(SOURCES)
-
-
+# Contributor(s): none yet.
#
-# Windows (32-bit)
-#
+# ***** END GPL LICENSE BLOCK *****
-win32-borlandc win32-bc:
- bcc32 -O2 -d -w -w-aus $(CPPFLAGS) $(SOURCES)
+LIBNAME = minilzo
+DIR = $(OCGDIR)/extern/$(LIBNAME)
-win32-cygwin32 win32-cygwin:
- gcc -mcygwin $(CPPFLAGS) $(GCC_CFLAGS) -o $(PROGRAM).exe $(SOURCES)
+include nan_compile.mk
-win32-digitalmars win32-dm:
- dmc -mn -o -w- $(CPPFLAGS) $(SOURCES)
-
-win32-intelc win32-ic:
- icl -nologo -MD -W3 -O2 -GF $(CPPFLAGS) $(SOURCES)
-
-win32-lccwin32:
- @echo "NOTE: need lcc 2002-07-25 or newer, older versions have bugs"
- lc -A -unused -O $(CPPFLAGS) $(SOURCES)
-
-win32-mingw32 win32-mingw:
- gcc -mno-cygwin $(CPPFLAGS) $(GCC_CFLAGS) -o $(PROGRAM).exe $(SOURCES)
-
-win32-visualc win32-vc:
- cl -nologo -MD -W3 -O2 -GF $(CPPFLAGS) $(SOURCES)
-
-win32-watcomc win32-wc:
- wcl386 -bt=nt -zq -mf -5r -zc -w5 -oneatx $(CPPFLAGS) $(SOURCES)
-
-
-#
-# DOS (16-bit)
-#
-
-dos16-borlandc dos16-bc:
- bcc -ml -w -d -O -4 $(CPPFLAGS) $(SOURCES)
-
-dos16-microsoftc dos16-msc dos16-mc:
- cl -nologo -f- -AL -O -G2 -W3 $(CPPFLAGS) $(SOURCES)
-
-dos16-watcomc dos16-wc:
- wcl -zq -ml -bt=dos -l=dos -ox -w5 $(CPPFLAGS) $(SOURCES)
-
-
-#
-# DOS (32-bit)
-#
-
-dos32-djgpp2 dos32-dj2:
- gcc $(CPPFLAGS) $(GCC_CFLAGS) -o $(PROGRAM).exe $(SOURCES)
-
-dos32-watcomc dos32-wc:
- wcl386 -zq -mf -bt=dos -l=dos4g -5r -ox -zc $(CPPFLAGS) $(SOURCES)
-
-
-#
-# other targets
-#
-
-clean:
- rm -f $(PROGRAM) $(PROGRAM).exe $(PROGRAM).map $(PROGRAM).tds
- rm -f *.err *.o *.obj
-
-.PHONY: default clean
-
+install: $(ALL_OR_DEBUG)
+ @[ -d $(NAN_LZO) ] || mkdir -p $(NAN_LZO)
+ @[ -d $(NAN_LZO)/minilzo ] || mkdir -p $(NAN_LZO)/minilzo
+ @[ -d $(NAN_LZO)/lib/$(DEBUG_DIR) ] || mkdir -p $(NAN_LZO)/lib/$(DEBUG_DIR)
+ @$(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)lib$(LIBNAME).a $(NAN_LZO)/lib/$(DEBUG_DIR)
+ifeq ($(OS),darwin)
+ ranlib $(NAN_LZO)/lib/$(DEBUG_DIR)lib$(LIBNAME).a
+endif
+ @$(NANBLENDERHOME)/intern/tools/cpifdiff.sh *.h $(NAN_LZO)/minilzo
Copied: branches/blender2.5/blender/extern/lzo/minilzo/Makefile.bak (from rev 22661, branches/blender2.5/blender/extern/lzo/minilzo/Makefile)
===================================================================
--- branches/blender2.5/blender/extern/lzo/minilzo/Makefile.bak (rev 0)
+++ branches/blender2.5/blender/extern/lzo/minilzo/Makefile.bak 2009-08-20 18:34:14 UTC (rev 22662)
@@ -0,0 +1,113 @@
+#
+# a very simple Makefile for miniLZO
+#
+# Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
+#
+
+PROGRAM = testmini
+SOURCES = testmini.c minilzo.c
+
+default:
+ @echo "Please choose one of the following targets:"
+ @echo " gcc: gcc"
+ @echo " unix: hpux hpux9"
+ @echo " win32: win32-bc win32-cygwin win32-dm win32-lccwin32"
+ @echo " win32-intelc win32-mingw win32-vc win32-watcomc"
+ @echo " dos16: dos16-bc dos16-mc dos16-wc"
+ @echo " dos32: dos32-djgpp2 dos32-wc"
+
+
+# Make sure that minilzo.h, lzoconf.h and lzodefs.h are in the
+# current dircectory. Otherwise you may want to adjust CPPFLAGS.
+##CPPFLAGS = -I../include/lzo -I.
+
+GCC_CFLAGS = -s -Wall -O2 -fomit-frame-pointer
+
+
+#
+# gcc (generic)
+#
+
+gcc:
+ gcc $(CPPFLAGS) $(GCC_CFLAGS) -o $(PROGRAM) $(SOURCES)
+
+cc:
+ cc $(CPPFLAGS) -o $(PROGRAM) $(SOURCES)
+
+
+#
+# UNIX
+#
+
+hpux:
+ cc -Ae $(CPPFLAGS) -o $(PROGRAM) $(SOURCES)
+
+hpux9:
+ cc -Aa -D_HPUX_SOURCE $(CPPFLAGS) -o $(PROGRAM) $(SOURCES)
+
+
+#
+# Windows (32-bit)
+#
+
+win32-borlandc win32-bc:
+ bcc32 -O2 -d -w -w-aus $(CPPFLAGS) $(SOURCES)
+
+win32-cygwin32 win32-cygwin:
+ gcc -mcygwin $(CPPFLAGS) $(GCC_CFLAGS) -o $(PROGRAM).exe $(SOURCES)
+
+win32-digitalmars win32-dm:
+ dmc -mn -o -w- $(CPPFLAGS) $(SOURCES)
+
+win32-intelc win32-ic:
+ icl -nologo -MD -W3 -O2 -GF $(CPPFLAGS) $(SOURCES)
+
+win32-lccwin32:
+ @echo "NOTE: need lcc 2002-07-25 or newer, older versions have bugs"
+ lc -A -unused -O $(CPPFLAGS) $(SOURCES)
+
+win32-mingw32 win32-mingw:
+ gcc -mno-cygwin $(CPPFLAGS) $(GCC_CFLAGS) -o $(PROGRAM).exe $(SOURCES)
+
+win32-visualc win32-vc:
+ cl -nologo -MD -W3 -O2 -GF $(CPPFLAGS) $(SOURCES)
+
+win32-watcomc win32-wc:
+ wcl386 -bt=nt -zq -mf -5r -zc -w5 -oneatx $(CPPFLAGS) $(SOURCES)
+
+
+#
+# DOS (16-bit)
+#
+
+dos16-borlandc dos16-bc:
+ bcc -ml -w -d -O -4 $(CPPFLAGS) $(SOURCES)
+
+dos16-microsoftc dos16-msc dos16-mc:
+ cl -nologo -f- -AL -O -G2 -W3 $(CPPFLAGS) $(SOURCES)
+
+dos16-watcomc dos16-wc:
+ wcl -zq -ml -bt=dos -l=dos -ox -w5 $(CPPFLAGS) $(SOURCES)
+
+
+#
+# DOS (32-bit)
+#
+
+dos32-djgpp2 dos32-dj2:
+ gcc $(CPPFLAGS) $(GCC_CFLAGS) -o $(PROGRAM).exe $(SOURCES)
+
+dos32-watcomc dos32-wc:
+ wcl386 -zq -mf -bt=dos -l=dos4g -5r -ox -zc $(CPPFLAGS) $(SOURCES)
+
+
+#
+# other targets
+#
+
+clean:
+ rm -f $(PROGRAM) $(PROGRAM).exe $(PROGRAM).map $(PROGRAM).tds
+ rm -f *.err *.o *.obj
+
+.PHONY: default clean
+
Modified: branches/blender2.5/blender/source/Makefile
===================================================================
--- branches/blender2.5/blender/source/Makefile 2009-08-20 17:59:37 UTC (rev 22661)
+++ branches/blender2.5/blender/source/Makefile 2009-08-20 18:34:14 UTC (rev 22662)
@@ -110,6 +110,9 @@
COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_src.a
COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_fx.a
COMLIB += $(NAN_SAMPLERATE)/lib/$(DEBUG_DIR)libsamplerate.a
+COMLIB += $(NAN_LZO)/lib/$(DEBUG_DIR)libminilzo.a
+COMLIB += $(NAN_LZMA)/lib/$(DEBUG_DIR)liblzma.a
+COMLIB += $(NAN_SMOKE)/lib/$(DEBUG_DIR)/libsmoke.a
ifneq ($(NAN_NO_KETSJI),true)
COMLIB += $(OCGDIR)/gameengine/bloutines/$(DEBUG_DIR)libbloutines.a
Modified: branches/blender2.5/blender/source/blender/blenfont/intern/blf_font.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenfont/intern/blf_font.c 2009-08-20 17:59:37 UTC (rev 22661)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list