Addes libopenjpeg (jpeg2000) support to the Makefiles
authorKent Mein <mein@cs.umn.edu>
Tue, 10 Mar 2009 16:04:29 +0000 (16:04 +0000)
committerKent Mein <mein@cs.umn.edu>
Tue, 10 Mar 2009 16:04:29 +0000 (16:04 +0000)
Kent

extern/Makefile
extern/libopenjpeg/Makefile [new file with mode: 0644]
source/Makefile
source/blender/blenkernel/intern/Makefile
source/blender/imbuf/intern/Makefile
source/blender/src/Makefile
source/creator/Makefile
source/nan_definitions.mk

index 51213698ebbfd83b88d7afaeab13090389279f52..38bec4b73dd0d649ba4b734322abc919af1ff050 100644 (file)
@@ -57,6 +57,10 @@ ifeq ($(WITH_BINRELOC), true)
     DIRS += binreloc
 endif
 
     DIRS += binreloc
 endif
 
+ifeq ($(WITH_OPENJPEG), true)
+    DIRS += libopenjpeg
+endif
+
 TARGET = solid
 
 all::
 TARGET = solid
 
 all::
diff --git a/extern/libopenjpeg/Makefile b/extern/libopenjpeg/Makefile
new file mode 100644 (file)
index 0000000..15d9d9c
--- /dev/null
@@ -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
+
index e9671cdae35e8877dbaadc147079d69014cdc044..fae14ba6c974e344ad4b431ad467e666cdc05383 100644 (file)
@@ -171,6 +171,10 @@ ifeq ($(WITH_OPENEXR), true)
     COMLIB += $(OCGDIR)/blender/imbuf/openexr/$(DEBUG_DIR)libopenexr.a
 endif
 
     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)
 COMLIB += $(OCGDIR)/blender/imbuf/cineon/$(DEBUG_DIR)libcineon.a
 
 ifeq ($(WITH_DDS), true)
index 8921ea5d3b7b287297515b9efd68ddc11364d956..226e416dad795aa43057717a77cc4d083f10a084 100644 (file)
@@ -108,6 +108,10 @@ ifeq ($(WITH_DDS), true)
     CPPFLAGS += -DWITH_DDS
 endif
 
     CPPFLAGS += -DWITH_DDS
 endif
 
+ifeq ($(WITH_OPENJPEG), true)
+    CPPFLAGS += -DWITH_OPENJPEG
+endif
+
 ifeq ($(WITH_QUICKTIME), true)
        CPPFLAGS += -I../../quicktime
        CPPFLAGS += -DWITH_QUICKTIME
 ifeq ($(WITH_QUICKTIME), true)
        CPPFLAGS += -I../../quicktime
        CPPFLAGS += -DWITH_QUICKTIME
index 8294931b60f61fa520b2aa717d468a84a7ffd14c..427052cbdc354bc45043868311cfadf15d8fdb57 100644 (file)
@@ -48,6 +48,10 @@ ifeq ($(WITH_DDS), true)
     CPPFLAGS += -DWITH_DDS
 endif
 
     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
 CFLAGS += $(LEVEL_1_C_WARNINGS)
 
 CPPFLAGS += -I$(NAN_JPEG)/include
index 46e916b04376962aea42c1cea1bcaac21af1e3f5..43d72a84c4881a8b1c64bb0e39d5adb5a06cb1c3 100644 (file)
@@ -127,6 +127,10 @@ ifeq ($(WITH_DDS),true)
        CPPFLAGS += -DWITH_DDS
 endif
 
        CPPFLAGS += -DWITH_DDS
 endif
 
+ifeq ($(WITH_OPENJPEG),true)
+       CPPFLAGS += -DWITH_OPENJPEG
+endif
+
 ifeq ($(INTERNATIONAL), true)
     CPPFLAGS += -DINTERNATIONAL
 endif
 ifeq ($(INTERNATIONAL), true)
     CPPFLAGS += -DINTERNATIONAL
 endif
index 9273d94388352b74764a2e5a09beee67297c23cb..97bfbeb5eb0380179746a213a4ba72f7bacd0ff7 100644 (file)
@@ -58,6 +58,9 @@ CPPFLAGS += -I$(NAN_GLEW)/include
 ifeq ($(WITH_QUICKTIME), true)
        CPPFLAGS += -I$(NAN_QUICKTIME)/include -DWITH_QUICKTIME
 endif
 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
 
 ifeq ($(WITH_BINRELOC), true)
        CPPFLAGS += -I$(NANBLENDERHOME)/extern/binreloc/include -DWITH_BINRELOC
index 3961e153ceafd93e68e26772e18cf973e4bf3de4..764ecf3d5568c1ec12f7d1837071e446f74e8770 100644 (file)
@@ -115,6 +115,7 @@ endif
 
     export WITH_OPENEXR ?= true
     export WITH_DDS ?= true
 
     export WITH_OPENEXR ?= true
     export WITH_DDS ?= true
+    export WITH_OPENJPEG ?= true
 
     ifeq ($(OS),windows)
       export NAN_WINTAB ?= $(LCGDIR)/wintab
 
     ifeq ($(OS),windows)
       export NAN_WINTAB ?= $(LCGDIR)/wintab