diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2011-05-03 07:06:49 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2011-05-03 07:06:49 +0400 |
| commit | 5fc6d567d0c9adf1131ee2f1f2520cf41146b075 (patch) | |
| tree | a9b6a940e702f00a55db417fb8eff8fe5d94761a | |
| parent | f7ff502e77003c7d09a535e7e097313ae771ab68 (diff) | |
fixed merge error
| -rw-r--r-- | extern/libopenjpeg/CMakeLists.txt | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/extern/libopenjpeg/CMakeLists.txt b/extern/libopenjpeg/CMakeLists.txt index 94bd11209e2..774d32ef4a2 100644 --- a/extern/libopenjpeg/CMakeLists.txt +++ b/extern/libopenjpeg/CMakeLists.txt @@ -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 + |