Browse Source

Fixed plugin registration after recent object library changes.

pull/34/head
Vladimír Vondruš 14 years ago
parent
commit
186adfbd73
  1. 2
      src/Plugins/TgaImporter/CMakeLists.txt
  2. 3
      src/Plugins/TgaImporter/TgaImporter.cpp
  3. 19
      src/Plugins/TgaImporter/TgaImporterPluginRegistration.cpp

2
src/Plugins/TgaImporter/CMakeLists.txt

@ -1,7 +1,7 @@
add_library(TgaImporterObjects OBJECT TgaImporter.cpp)
set_target_properties(TgaImporterObjects PROPERTIES COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS})
corrade_add_plugin(TgaImporter ${MAGNUM_PLUGINS_IMPORTER_INSTALL_DIR} TgaImporter.conf $<TARGET_OBJECTS:TgaImporterObjects>)
corrade_add_plugin(TgaImporter ${MAGNUM_PLUGINS_IMPORTER_INSTALL_DIR} TgaImporter.conf $<TARGET_OBJECTS:TgaImporterObjects> TgaImporterPluginRegistration.cpp)
target_link_libraries(TgaImporter ${MAGNUM_LIBRARY})
if(BUILD_TESTS)

3
src/Plugins/TgaImporter/TgaImporter.cpp

@ -22,9 +22,6 @@
using namespace std;
using namespace Corrade::Utility;
PLUGIN_REGISTER(TgaImporter, Magnum::Trade::TgaImporter::TgaImporter,
"cz.mosra.magnum.Trade.AbstractImporter/0.1")
namespace Magnum { namespace Trade { namespace TgaImporter {
static_assert(sizeof(TgaImporter::Header) == 18, "TgaImporter: header size is not 18 bytes");

19
src/Plugins/TgaImporter/TgaImporterPluginRegistration.cpp

@ -0,0 +1,19 @@
/*
Copyright © 2010, 2011, 2012 Vladimír Vondruš <mosra@centrum.cz>
This file is part of Magnum.
Magnum is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License version 3
only, as published by the Free Software Foundation.
Magnum 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 Lesser General Public License version 3 for more details.
*/
#include "TgaImporter.h"
PLUGIN_REGISTER(TgaImporter, Magnum::Trade::TgaImporter::TgaImporter,
"cz.mosra.magnum.Trade.AbstractImporter/0.1")
Loading…
Cancel
Save