diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2013-10-09 06:33:44 +0400 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2013-10-09 06:33:44 +0400 |
commit | 48afcb80b5cb400467639602cf07741bd88dc3f7 (patch) | |
tree | 858139fb13fff263e1e0da8d06d3b9f061bc8d2f /source | |
parent | 4abb8fde95260e692b3cd5b5b2f8bcd1d1f3be3b (diff) |
fix building when WITH_PSD is OFF, stub is not needed afterall
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/imbuf/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/imbuf/intern/oiio/openimageio_stub.cpp | 35 |
2 files changed, 0 insertions, 39 deletions
diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt index 58738155c50..40075dea1c1 100644 --- a/source/blender/imbuf/CMakeLists.txt +++ b/source/blender/imbuf/CMakeLists.txt @@ -108,10 +108,6 @@ endif() if(WITH_IMAGE_PSD) add_definitions(-DWITH_PSD) -else() - list(APPEND SRC - intern/oiio/openimageio_stub.cpp - ) endif() if(WITH_IMAGE_OPENJPEG) diff --git a/source/blender/imbuf/intern/oiio/openimageio_stub.cpp b/source/blender/imbuf/intern/oiio/openimageio_stub.cpp deleted file mode 100644 index b57de0b24a7..00000000000 --- a/source/blender/imbuf/intern/oiio/openimageio_stub.cpp +++ /dev/null @@ -1,35 +0,0 @@ -/* - * ***** 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * The Original Code is Copyright (C) 2013 Blender Foundation - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): - * - * ***** END GPL LICENSE BLOCK ***** - */ - - -/** \file blender/imbuf/intern/oiio/openimageio_api.h - * \ingroup openimageio - */ - -#include "openimageio_api.h" - -#endif |