diff options
| -rw-r--r-- | extern/Makefile | 4 | ||||
| -rw-r--r-- | extern/libopenjpeg/Makefile | 43 | ||||
| -rw-r--r-- | source/Makefile | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/Makefile | 4 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/Makefile | 4 | ||||
| -rw-r--r-- | source/blender/src/Makefile | 4 | ||||
| -rw-r--r-- | source/creator/Makefile | 3 | ||||
| -rw-r--r-- | source/nan_definitions.mk | 1 |
8 files changed, 67 insertions, 0 deletions
diff --git a/extern/Makefile b/extern/Makefile index 51213698ebb..38bec4b73dd 100644 --- a/extern/Makefile +++ b/extern/Makefile @@ -57,6 +57,10 @@ ifeq ($(WITH_BINRELOC), true) DIRS += binreloc endif +ifeq ($(WITH_OPENJPEG), true) + DIRS += libopenjpeg +endif + TARGET = solid all:: diff --git a/extern/libopenjpeg/Makefile b/extern/libopenjpeg/Makefile new file mode 100644 index 00000000000..15d9d9c7c01 --- /dev/null +++ b/extern/libopenjpeg/Makefile @@ -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 + diff --git a/source/Makefile b/source/Makefile index e9671cdae35..fae14ba6c97 100644 --- a/source/Makefile +++ b/source/Makefile @@ -171,6 +171,10 @@ ifeq ($(WITH_OPENEXR), true) 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) diff --git a/source/blender/blenkernel/intern/Makefile b/source/blender/blenkernel/intern/Makefile index 8921ea5d3b7..226e416dad7 100644 --- a/source/blender/blenkernel/intern/Makefile +++ b/source/blender/blenkernel/intern/Makefile @@ -108,6 +108,10 @@ ifeq ($(WITH_DDS), true) CPPFLAGS += -DWITH_DDS endif +ifeq ($(WITH_OPENJPEG), true) + CPPFLAGS += -DWITH_OPENJPEG +endif + ifeq ($(WITH_QUICKTIME), true) CPPFLAGS += -I../../quicktime CPPFLAGS += -DWITH_QUICKTIME diff --git a/source/blender/imbuf/intern/Makefile b/source/blender/imbuf/intern/Makefile index 8294931b60f..427052cbdc3 100644 --- a/source/blender/imbuf/intern/Makefile +++ b/source/blender/imbuf/intern/Makefile @@ -48,6 +48,10 @@ ifeq ($(WITH_DDS), true) 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 diff --git a/source/blender/src/Makefile b/source/blender/src/Makefile index 46e916b0437..43d72a84c48 100644 --- a/source/blender/src/Makefile +++ b/source/blender/src/Makefile @@ -127,6 +127,10 @@ ifeq ($(WITH_DDS),true) CPPFLAGS += -DWITH_DDS endif +ifeq ($(WITH_OPENJPEG),true) + CPPFLAGS += -DWITH_OPENJPEG +endif + ifeq ($(INTERNATIONAL), true) CPPFLAGS += -DINTERNATIONAL endif diff --git a/source/creator/Makefile b/source/creator/Makefile index 9273d943883..97bfbeb5eb0 100644 --- a/source/creator/Makefile +++ b/source/creator/Makefile @@ -58,6 +58,9 @@ CPPFLAGS += -I$(NAN_GLEW)/include 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 diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index 3961e153cea..764ecf3d556 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -115,6 +115,7 @@ endif export WITH_OPENEXR ?= true export WITH_DDS ?= true + export WITH_OPENJPEG ?= true ifeq ($(OS),windows) export NAN_WINTAB ?= $(LCGDIR)/wintab |