diff options
| author | Kent Mein <mein@cs.umn.edu> | 2009-03-10 19:04:29 +0300 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2009-03-10 19:04:29 +0300 |
| commit | d17ca2179d7a2dc4e77dd427fdfb416929a454c7 (patch) | |
| tree | 0cac720160d58fbd417a57af24ddd8ad68c445fb /source | |
| parent | 4a089890df818636be28a3f494c5851c2c0b1efd (diff) | |
Addes libopenjpeg (jpeg2000) support to the Makefiles
Kent
Diffstat (limited to 'source')
| -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 |
6 files changed, 20 insertions, 0 deletions
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 |