forked from bartvdbraak/blender
Addes libopenjpeg (jpeg2000) support to the Makefiles
Kent
This commit is contained in:
parent
4a089890df
commit
d17ca2179d
4
extern/Makefile
vendored
4
extern/Makefile
vendored
@ -57,6 +57,10 @@ ifeq ($(WITH_BINRELOC), true)
|
|||||||
DIRS += binreloc
|
DIRS += binreloc
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(WITH_OPENJPEG), true)
|
||||||
|
DIRS += libopenjpeg
|
||||||
|
endif
|
||||||
|
|
||||||
TARGET = solid
|
TARGET = solid
|
||||||
|
|
||||||
all::
|
all::
|
||||||
|
43
extern/libopenjpeg/Makefile
vendored
Normal file
43
extern/libopenjpeg/Makefile
vendored
Normal file
@ -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
|
||||||
|
|
@ -171,6 +171,10 @@ ifeq ($(WITH_OPENEXR), true)
|
|||||||
COMLIB += $(OCGDIR)/blender/imbuf/openexr/$(DEBUG_DIR)libopenexr.a
|
COMLIB += $(OCGDIR)/blender/imbuf/openexr/$(DEBUG_DIR)libopenexr.a
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(WITH_OPENJPEG), true)
|
||||||
|
COMLIB += $(OCGDIR)/extern/openjpeg/$(DEBUG_DIR)libopenjpeg.a
|
||||||
|
endif
|
||||||
|
|
||||||
COMLIB += $(OCGDIR)/blender/imbuf/cineon/$(DEBUG_DIR)libcineon.a
|
COMLIB += $(OCGDIR)/blender/imbuf/cineon/$(DEBUG_DIR)libcineon.a
|
||||||
|
|
||||||
ifeq ($(WITH_DDS), true)
|
ifeq ($(WITH_DDS), true)
|
||||||
|
@ -108,6 +108,10 @@ ifeq ($(WITH_DDS), true)
|
|||||||
CPPFLAGS += -DWITH_DDS
|
CPPFLAGS += -DWITH_DDS
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(WITH_OPENJPEG), true)
|
||||||
|
CPPFLAGS += -DWITH_OPENJPEG
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(WITH_QUICKTIME), true)
|
ifeq ($(WITH_QUICKTIME), true)
|
||||||
CPPFLAGS += -I../../quicktime
|
CPPFLAGS += -I../../quicktime
|
||||||
CPPFLAGS += -DWITH_QUICKTIME
|
CPPFLAGS += -DWITH_QUICKTIME
|
||||||
|
@ -48,6 +48,10 @@ ifeq ($(WITH_DDS), true)
|
|||||||
CPPFLAGS += -DWITH_DDS
|
CPPFLAGS += -DWITH_DDS
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(WITH_OPENJPEG), true)
|
||||||
|
CFLAGS += -DWITH_OPENJPEG -I../../../../extern/libopenjpeg
|
||||||
|
endif
|
||||||
|
|
||||||
CFLAGS += $(LEVEL_1_C_WARNINGS)
|
CFLAGS += $(LEVEL_1_C_WARNINGS)
|
||||||
|
|
||||||
CPPFLAGS += -I$(NAN_JPEG)/include
|
CPPFLAGS += -I$(NAN_JPEG)/include
|
||||||
|
@ -127,6 +127,10 @@ ifeq ($(WITH_DDS),true)
|
|||||||
CPPFLAGS += -DWITH_DDS
|
CPPFLAGS += -DWITH_DDS
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(WITH_OPENJPEG),true)
|
||||||
|
CPPFLAGS += -DWITH_OPENJPEG
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(INTERNATIONAL), true)
|
ifeq ($(INTERNATIONAL), true)
|
||||||
CPPFLAGS += -DINTERNATIONAL
|
CPPFLAGS += -DINTERNATIONAL
|
||||||
endif
|
endif
|
||||||
|
@ -58,6 +58,9 @@ CPPFLAGS += -I$(NAN_GLEW)/include
|
|||||||
ifeq ($(WITH_QUICKTIME), true)
|
ifeq ($(WITH_QUICKTIME), true)
|
||||||
CPPFLAGS += -I$(NAN_QUICKTIME)/include -DWITH_QUICKTIME
|
CPPFLAGS += -I$(NAN_QUICKTIME)/include -DWITH_QUICKTIME
|
||||||
endif
|
endif
|
||||||
|
ifeq ($(WITH_OPENJPEG), true)
|
||||||
|
CPPFLAGS += -DWITH_OPENJPEG
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(WITH_BINRELOC), true)
|
ifeq ($(WITH_BINRELOC), true)
|
||||||
CPPFLAGS += -I$(NANBLENDERHOME)/extern/binreloc/include -DWITH_BINRELOC
|
CPPFLAGS += -I$(NANBLENDERHOME)/extern/binreloc/include -DWITH_BINRELOC
|
||||||
|
@ -115,6 +115,7 @@ endif
|
|||||||
|
|
||||||
export WITH_OPENEXR ?= true
|
export WITH_OPENEXR ?= true
|
||||||
export WITH_DDS ?= true
|
export WITH_DDS ?= true
|
||||||
|
export WITH_OPENJPEG ?= true
|
||||||
|
|
||||||
ifeq ($(OS),windows)
|
ifeq ($(OS),windows)
|
||||||
export NAN_WINTAB ?= $(LCGDIR)/wintab
|
export NAN_WINTAB ?= $(LCGDIR)/wintab
|
||||||
|
Loading…
Reference in New Issue
Block a user