[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19245] trunk/blender: Addes libopenjpeg ( jpeg2000) support to the Makefiles

[Kent Mein]

Revision: 19245
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19245
Author:   sirdude
Date:     2009-03-10 17:04:29 +0100 (Tue, 10 Mar 2009)

Log Message:
-----------
Addes libopenjpeg (jpeg2000) support to the Makefiles

Kent

Modified Paths:
--------------
    trunk/blender/extern/Makefile
    trunk/blender/source/Makefile
    trunk/blender/source/blender/blenkernel/intern/Makefile
    trunk/blender/source/blender/imbuf/intern/Makefile
    trunk/blender/source/blender/src/Makefile
    trunk/blender/source/creator/Makefile
    trunk/blender/source/nan_definitions.mk

Added Paths:
-----------
    trunk/blender/extern/libopenjpeg/Makefile

Modified: trunk/blender/extern/Makefile
===================================================================
--- trunk/blender/extern/Makefile	2009-03-10 08:54:35 UTC (rev 19244)
+++ trunk/blender/extern/Makefile	2009-03-10 16:04:29 UTC (rev 19245)
@@ -57,6 +57,10 @@
     DIRS += binreloc
 endif
 
+ifeq ($(WITH_OPENJPEG), true)
+    DIRS += libopenjpeg
+endif
+
 TARGET = solid
 
 all::

Added: trunk/blender/extern/libopenjpeg/Makefile
===================================================================
--- trunk/blender/extern/libopenjpeg/Makefile	                        (rev 0)
+++ trunk/blender/extern/libopenjpeg/Makefile	2009-03-10 16:04:29 UTC (rev 19245)
@@ -0,0 +1,43 @@
+#
+# $Id: Makefile 14444 2008-04-16 22:40:48Z hos $
+#
+# ***** BEGIN GPL 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.
+#
+# 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): none yet.
+#
+# ***** END GPL LICENSE BLOCK *****
+#
+#
+
+LIBNAME = openjpeg
+DIR = $(OCGDIR)/extern/$(LIBNAME)
+
+CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
+
+TCSRCS = $(wildcard *.c)
+CSRCS = $(filter-out t1_generate_luts.c,$(TCSRCS))
+
+include nan_compile.mk 
+CPPFLAGS += -I.
+
+install: all debug
+

Modified: trunk/blender/source/Makefile
===================================================================
--- trunk/blender/source/Makefile	2009-03-10 08:54:35 UTC (rev 19244)
+++ trunk/blender/source/Makefile	2009-03-10 16:04:29 UTC (rev 19245)
@@ -171,6 +171,10 @@
     COMLIB += $(OCGDIR)/blender/imbuf/openexr/$(DEBUG_DIR)libopenexr.a
 endif
 
+ifeq ($(WITH_OPENJPEG), true)
+    COMLIB += $(OCGDIR)/extern/openjpeg/$(DEBUG_DIR)libopenjpeg.a
+endif
+
 COMLIB += $(OCGDIR)/blender/imbuf/cineon/$(DEBUG_DIR)libcineon.a
 
 ifeq ($(WITH_DDS), true)

Modified: trunk/blender/source/blender/blenkernel/intern/Makefile
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/Makefile	2009-03-10 08:54:35 UTC (rev 19244)
+++ trunk/blender/source/blender/blenkernel/intern/Makefile	2009-03-10 16:04:29 UTC (rev 19245)
@@ -108,6 +108,10 @@
     CPPFLAGS += -DWITH_DDS
 endif
 
+ifeq ($(WITH_OPENJPEG), true)
+    CPPFLAGS += -DWITH_OPENJPEG
+endif
+
 ifeq ($(WITH_QUICKTIME), true)
 	CPPFLAGS += -I../../quicktime
 	CPPFLAGS += -DWITH_QUICKTIME

Modified: trunk/blender/source/blender/imbuf/intern/Makefile
===================================================================
--- trunk/blender/source/blender/imbuf/intern/Makefile	2009-03-10 08:54:35 UTC (rev 19244)
+++ trunk/blender/source/blender/imbuf/intern/Makefile	2009-03-10 16:04:29 UTC (rev 19245)
@@ -48,6 +48,10 @@
     CPPFLAGS += -DWITH_DDS
 endif
 
+ifeq ($(WITH_OPENJPEG), true)
+    CFLAGS += -DWITH_OPENJPEG -I../../../../extern/libopenjpeg
+endif
+
 CFLAGS += $(LEVEL_1_C_WARNINGS)
 
 CPPFLAGS += -I$(NAN_JPEG)/include

Modified: trunk/blender/source/blender/src/Makefile
===================================================================
--- trunk/blender/source/blender/src/Makefile	2009-03-10 08:54:35 UTC (rev 19244)
+++ trunk/blender/source/blender/src/Makefile	2009-03-10 16:04:29 UTC (rev 19245)
@@ -127,6 +127,10 @@
 	CPPFLAGS += -DWITH_DDS
 endif
 
+ifeq ($(WITH_OPENJPEG),true)
+	CPPFLAGS += -DWITH_OPENJPEG
+endif
+
 ifeq ($(INTERNATIONAL), true)
     CPPFLAGS += -DINTERNATIONAL
 endif

Modified: trunk/blender/source/creator/Makefile
===================================================================
--- trunk/blender/source/creator/Makefile	2009-03-10 08:54:35 UTC (rev 19244)
+++ trunk/blender/source/creator/Makefile	2009-03-10 16:04:29 UTC (rev 19245)
@@ -58,6 +58,9 @@
 ifeq ($(WITH_QUICKTIME), true)
 	CPPFLAGS += -I$(NAN_QUICKTIME)/include -DWITH_QUICKTIME
 endif
+ifeq ($(WITH_OPENJPEG), true)
+	CPPFLAGS += -DWITH_OPENJPEG
+endif
 
 ifeq ($(WITH_BINRELOC), true)
 	CPPFLAGS += -I$(NANBLENDERHOME)/extern/binreloc/include -DWITH_BINRELOC

Modified: trunk/blender/source/nan_definitions.mk
===================================================================
--- trunk/blender/source/nan_definitions.mk	2009-03-10 08:54:35 UTC (rev 19244)
+++ trunk/blender/source/nan_definitions.mk	2009-03-10 16:04:29 UTC (rev 19245)
@@ -115,6 +115,7 @@
 
     export WITH_OPENEXR ?= true
     export WITH_DDS ?= true
+    export WITH_OPENJPEG ?= true
 
     ifeq ($(OS),windows)
       export NAN_WINTAB ?= $(LCGDIR)/wintab