Browse Source

TextureTools: shorter filenames for headers.

To be consistent with the rest, I don't know how did I forget about
this. Also it seems that the resource import header was never used, as
it included long-gone magnumConfigure.h. Thus I'm also not maintaining
any backwards compatibility, because it never worked in the first place.
pull/77/head
Vladimír Vondruš 12 years ago
parent
commit
740c4dbcd6
  1. 2
      src/Magnum/TextureTools/Atlas.h
  2. 4
      src/Magnum/TextureTools/CMakeLists.txt
  3. 2
      src/Magnum/TextureTools/DistanceField.h
  4. 8
      src/Magnum/TextureTools/resourceImport.hpp
  5. 4
      src/Magnum/TextureTools/visibility.h

2
src/Magnum/TextureTools/Atlas.h

@ -33,7 +33,7 @@
#include "Magnum/Magnum.h"
#include "Magnum/Math/Vector2.h"
#include "Magnum/TextureTools/magnumTextureToolsVisibility.h"
#include "Magnum/TextureTools/visibility.h"
namespace Magnum { namespace TextureTools {

4
src/Magnum/TextureTools/CMakeLists.txt

@ -34,10 +34,10 @@ set(MagnumTextureTools_HEADERS
Atlas.h
DistanceField.h
magnumTextureToolsVisibility.h)
visibility.h)
if(BUILD_STATIC)
set(MagnumTextureTools_HEADERS ${MagnumTextureTools_HEADERS} magnumTextureToolsResourceImport.hpp)
list(APPEND MagnumTextureTools_HEADERS resourceImport.hpp)
endif()
add_library(MagnumTextureTools ${SHARED_OR_STATIC}

2
src/Magnum/TextureTools/DistanceField.h

@ -34,7 +34,7 @@
#endif
#include "Magnum/Magnum.h"
#include "Magnum/TextureTools/magnumTextureToolsVisibility.h"
#include "Magnum/TextureTools/visibility.h"
namespace Magnum { namespace TextureTools {

8
src/Magnum/TextureTools/magnumTextureToolsResourceImport.hpp → src/Magnum/TextureTools/resourceImport.hpp

@ -1,5 +1,5 @@
#ifndef Magnum_TextureTools_magnumTextureToolsResourceImport_hpp
#define Magnum_TextureTools_magnumTextureToolsResourceImport_hpp
#ifndef Magnum_TextureTools_resourceImport_hpp
#define Magnum_TextureTools_resourceImport_hpp
/*
This file is part of Magnum.
@ -25,7 +25,7 @@
DEALINGS IN THE SOFTWARE.
*/
#include "Magnum/magnumConfigure.h"
#include "Magnum/configure.h"
#ifdef MAGNUM_BUILD_STATIC
#include <Corrade/Utility/Resource.h>
@ -35,6 +35,8 @@ static int magnumTextureToolsResourceImport() {
CORRADE_RESOURCE_INITIALIZE(MagnumTextureTools_RCS)
return 0;
} CORRADE_AUTOMATIC_INITIALIZER(magnumTextureToolsResourceImport)
#else
#error this header is available only in static build
#endif
#endif

4
src/Magnum/TextureTools/magnumTextureToolsVisibility.h → src/Magnum/TextureTools/visibility.h

@ -1,5 +1,5 @@
#ifndef Magnum_TextureTools_magnumTextureToolsVisibility_h
#define Magnum_TextureTools_magnumTextureToolsVisibility_h
#ifndef Magnum_TextureTools_visibility_h
#define Magnum_TextureTools_visibility_h
/*
This file is part of Magnum.
Loading…
Cancel
Save