diff --git a/src/Magnum/Shaders/CMakeLists.txt b/src/Magnum/Shaders/CMakeLists.txt index a86f652a9..18a12277f 100644 --- a/src/Magnum/Shaders/CMakeLists.txt +++ b/src/Magnum/Shaders/CMakeLists.txt @@ -54,10 +54,6 @@ set(MagnumShaders_PRIVATE_HEADERS Implementation/CreateCompatibilityShader.h) if(BUILD_STATIC) set(MagnumShaders_HEADERS ${MagnumShaders_HEADERS} resourceImport.hpp) - - if(BUILD_DEPRECATED) - set(MagnumShaders_HEADERS ${MagnumShaders_HEADERS} magnumShadersResourceImport.hpp) - endif() endif() # Shaders library diff --git a/src/Magnum/Shaders/magnumShadersResourceImport.hpp b/src/Magnum/Shaders/magnumShadersResourceImport.hpp deleted file mode 100644 index 591e1a4d2..000000000 --- a/src/Magnum/Shaders/magnumShadersResourceImport.hpp +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef Magnum_Shaders_magnumShadersResourceImport_hpp -#define Magnum_Shaders_magnumShadersResourceImport_hpp -/* - This file is part of Magnum. - - Copyright © 2010, 2011, 2012, 2013, 2014, 2015 - Vladimír Vondruš - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. -*/ - -#include "Magnum/configure.h" - -#ifdef MAGNUM_BUILD_STATIC -#ifdef MAGNUM_BUILD_DEPRECATED -#include "Magnum/Shaders/resourceImport.hpp" -#else -#error use Magnum/Shaders/resourceImport.hpp instead -#endif -#else -#error this header is available only in static build -#endif - -#endif