Addes jpeg2000 support to cmake.

I also did some small tweaks.  removed ifdef's for pluginapi
didn't need them there.
Fixed it so the filesel shows jp2 as image files.
(I'm going to do makefiles next)

Kent

6 files changed, 22 insertions, 4 deletions

diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 04ca5c79a11..27be1b45779 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -47,6 +47,10 @@ IF(WITH_OPENEXR)
   ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
+IF(WITH_OPENJPEG)
+  ADD_DEFINITIONS(-DWITH_OPENJPEG)
+ENDIF(WITH_OPENJPEG)
+
 IF(WITH_DDS)
   ADD_DEFINITIONS(-DWITH_DDS)
 ENDIF(WITH_DDS)
diff --git a/source/blender/blenpluginapi/iff.h b/source/blender/blenpluginapi/iff.h
index e7f328d870f..9378cdc9134 100644
--- a/source/blender/blenpluginapi/iff.h
+++ b/source/blender/blenpluginapi/iff.h
@@ -45,6 +45,8 @@
 #define IB_zbuf			(1 << 13)
 #define IB_rgba			(1 << 14)
 
+#define JP2             (1 << 18)
+
 #define AMI             (1 << 31)
 #define PNG             (1 << 30)
 #define Anim            (1 << 29)
@@ -56,10 +58,6 @@
 #endif
 #define RADHDR  (1<<24)
 
-#ifdef WITH_OPENJPEG
-#define JP2                            (1 << 18)
-#endif
-
 #define RAWTGA	(TGA | 1)
 
 #define JPG_STD	(JPG | (0 << 8))
diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt
index 2d41a6d73e6..9894aa8136e 100644
--- a/source/blender/imbuf/CMakeLists.txt
+++ b/source/blender/imbuf/CMakeLists.txt
@@ -33,6 +33,7 @@ SET(INC
   ${PNG_INC}
   ${TIFF_INC}
   ${ZLIB_INC}
+  ${OPENJPEG_INC}
 )
 
 IF(WITH_VERSE)
@@ -44,6 +45,10 @@ IF(WITH_OPENEXR)
   ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
+IF(WITH_OPENJPEG)
+  ADD_DEFINITIONS(-DWITH_OPENJPEG)
+ENDIF(WITH_OPENJPEG)
+
 IF(WITH_QUICKTIME)
   SET(INC ${INC} ${QUICKTIME_INC})
   ADD_DEFINITIONS(-DWITH_QUICKTIME)
diff --git a/source/blender/src/CMakeLists.txt b/source/blender/src/CMakeLists.txt
index e2757dbc75d..dc2928cd17b 100644
--- a/source/blender/src/CMakeLists.txt
+++ b/source/blender/src/CMakeLists.txt
@@ -50,6 +50,10 @@ IF(WITH_OPENEXR)
   ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)
 
+IF(WITH_OPENJPEG)
+  ADD_DEFINITIONS(-DWITH_OPENJPEG)
+ENDIF(WITH_OPENJPEG)
+
 IF(WITH_QUICKTIME)
   SET(INC ${INC} ${QUICKTIME_INC})
   ADD_DEFINITIONS(-DWITH_QUICKTIME)
diff --git a/source/blender/src/filesel.c b/source/blender/src/filesel.c
index ee1fc523395..9800c80b57d 100644
--- a/source/blender/src/filesel.c
+++ b/source/blender/src/filesel.c
@@ -380,6 +380,9 @@ void test_flags_file(SpaceFile *sfile)
 			} else if (G.have_quicktime){
 				if(		BLI_testextensie(file->relname, ".jpg")
 					||	BLI_testextensie(file->relname, ".jpeg")
+#ifdef WITH_OPENJPEG
+					||	BLI_testextensie(file->relname, ".jp2")
+#endif
 					||	BLI_testextensie(file->relname, ".hdr")
 					||	BLI_testextensie(file->relname, ".exr")
 					||	BLI_testextensie(file->relname, ".tga")
@@ -414,6 +417,9 @@ void test_flags_file(SpaceFile *sfile)
 				}
 			} else { // no quicktime
 				if(BLI_testextensie(file->relname, ".jpg")
+#ifdef WITH_OPENJPEG
+					||	BLI_testextensie(file->relname, ".jp2")
+#endif
 				   ||	BLI_testextensie(file->relname, ".hdr")
 				   ||	BLI_testextensie(file->relname, ".exr")
 					||	BLI_testextensie(file->relname, ".tga")
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index ee6f19e457d..8e2a906614d 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -267,6 +267,7 @@ IF(UNIX)
     bf_quicktime
     extern_binreloc
     extern_glew
+    extern_libopenjpeg
     bf_videotex
   )