Browse Source

TextureTools: what's up with this arcane naming.

pull/578/head
Vladimír Vondruš 4 years ago
parent
commit
09c575fd00
  1. 6
      src/Magnum/TextureTools/CMakeLists.txt
  2. 2
      src/Magnum/TextureTools/DistanceField.cpp

6
src/Magnum/TextureTools/CMakeLists.txt

@ -36,11 +36,11 @@ set(MagnumTextureTools_HEADERS
visibility.h) visibility.h)
if(MAGNUM_TARGET_GL) if(MAGNUM_TARGET_GL)
corrade_add_resource(MagnumTextureTools_RCS resources.conf) corrade_add_resource(MagnumTextureTools_RESOURCES resources.conf)
if(MAGNUM_BUILD_STATIC) if(MAGNUM_BUILD_STATIC)
# On the static build we're importing the resources manually, so no # On the static build we're importing the resources manually, so no
# need to have the implicit initializers as well. # need to have the implicit initializers as well.
set_property(SOURCE ${MagnumTextureTools_RCS} APPEND PROPERTY set_property(SOURCE ${MagnumTextureTools_RESOURCES} APPEND PROPERTY
COMPILE_DEFINITIONS COMPILE_DEFINITIONS
"CORRADE_AUTOMATIC_INITIALIZER=CORRADE_NOOP" "CORRADE_AUTOMATIC_INITIALIZER=CORRADE_NOOP"
"CORRADE_AUTOMATIC_FINALIZER=CORRADE_NOOP") "CORRADE_AUTOMATIC_FINALIZER=CORRADE_NOOP")
@ -48,7 +48,7 @@ if(MAGNUM_TARGET_GL)
list(APPEND MagnumTextureTools_SRCS list(APPEND MagnumTextureTools_SRCS
DistanceField.cpp DistanceField.cpp
${MagnumTextureTools_RCS}) ${MagnumTextureTools_RESOURCES})
list(APPEND MagnumTextureTools_HEADERS DistanceField.h) list(APPEND MagnumTextureTools_HEADERS DistanceField.h)
endif() endif()

2
src/Magnum/TextureTools/DistanceField.cpp

@ -42,7 +42,7 @@
#ifdef MAGNUM_BUILD_STATIC #ifdef MAGNUM_BUILD_STATIC
static void importTextureToolResources() { static void importTextureToolResources() {
CORRADE_RESOURCE_INITIALIZE(MagnumTextureTools_RCS) CORRADE_RESOURCE_INITIALIZE(MagnumTextureTools_RESOURCES)
} }
#endif #endif

Loading…
Cancel
Save