diff options
| author | Kent Mein <mein@cs.umn.edu> | 2009-03-06 18:46:13 +0300 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2009-03-06 18:46:13 +0300 |
| commit | 78af62bec81467fae5994547919aa255361e8f18 (patch) | |
| tree | e92aba060dbf865bdd132463ab5761780def1b99 /extern | |
| parent | 51b3bba1c01bbb89586b44c21501bbe4749b03ad (diff) | |
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
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | extern/libopenjpeg/CMakeLists.txt | 32 |
2 files changed, 36 insertions, 1 deletions
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index ee5cab31e09..b81efb52de9 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -29,7 +29,7 @@ IF(WITH_GAMEENGINE) ENDIF(WITH_GAMEENGINE) IF(WITH_BULLET) - SUBDIRS(bullet2) + SUBDIRS(bullet2) ENDIF(WITH_BULLET) IF(WITH_INTERNATIONAL) @@ -46,3 +46,6 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") SUBDIRS(glew) +IF(WITH_OPENJPEG) + SUBDIRS(libopenjpeg) +ENDIF(WITH_OPENJPEG) diff --git a/extern/libopenjpeg/CMakeLists.txt b/extern/libopenjpeg/CMakeLists.txt new file mode 100644 index 00000000000..c179d5328b9 --- /dev/null +++ b/extern/libopenjpeg/CMakeLists.txt @@ -0,0 +1,32 @@ +# $Id: CMakeLists.txt 14444 2008-04-16 22:40:48Z hos $ +# ***** BEGIN GPL LICENSE BLOCK ***** +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# The Original Code is Copyright (C) 2006, Blender Foundation +# All rights reserved. +# +# The Original Code is: all of this file. +# +# Contributor(s): Jacques Beaurain. +# +# ***** END GPL LICENSE BLOCK ***** + +SET(INC . src ${FREETYPE_INC}) + +FILE(GLOB SRC *.c except t1_generate_luts.c) +ADD_DEFINITIONS(-DWITH_OPENJPEG) +BLENDERLIB(extern_libopenjpeg "${SRC}" "${INC}") +#, libtype=['international','player'], priority=[5, 210]) |