Addes libopenjpeg (jpeg2000) support to the Makefiles

Kent

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)

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

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

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

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

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