fixed merge error
authorJoseph Eagar <joeedh@gmail.com>
Tue, 3 May 2011 03:06:49 +0000 (03:06 +0000)
committerJoseph Eagar <joeedh@gmail.com>
Tue, 3 May 2011 03:06:49 +0000 (03:06 +0000)
extern/libopenjpeg/CMakeLists.txt

index 94bd11209e232fc9626cf0c0fe2cf78e7c84592d..774d32ef4a2cf82fe99351ea11685cf8002c309e 100644 (file)
@@ -28,12 +28,6 @@ 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
@@ -80,4 +74,4 @@ set(SRC
 )
 
 blender_add_lib(extern_openjpeg "${SRC}" "${INC}")
->>>>>>> .merge-right.r35190
+