merge with/from trunk at r35190
[blender.git] / extern / libopenjpeg / CMakeLists.txt
index c5ba1363246cd59fac110130cf162a9ad0bbf30f..94bd11209e232fc9626cf0c0fe2cf78e7c84592d 100644 (file)
@@ -28,6 +28,12 @@ set(INC
        .
 )
 
+<<<<<<< .working
+FILE(GLOB SRC *.c except t1_generate_luts.c)
+ADD_DEFINITIONS(-DWITH_OPENJPEG)
+BLENDERLIB(extern_openjpeg "${SRC}" "${INC}")
+#, libtype=['international','player'], priority=[5, 210])
+=======
 set(SRC
        bio.c
        cio.c
@@ -74,3 +80,4 @@ set(SRC
 )
 
 blender_add_lib(extern_openjpeg "${SRC}" "${INC}")
+>>>>>>> .merge-right.r35190