sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fixed merge error

Browse Source
This commit is contained in:
Joseph Eagar 2011-05-03 03:06:49 +00:00
parent f7ff502e77
commit 5fc6d567d0
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extern/libopenjpeg/CMakeLists.txt vendored
View 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 set(SRC
bio.c bio.c
cio.c cio.c
@ -80,4 +74,4 @@ set(SRC
) )
blender_add_lib(extern_openjpeg "${SRC}" "${INC}") blender_add_lib(extern_openjpeg "${SRC}" "${INC}")
>>>>>>> .merge-right.r35190