Merge branch 'master' into nikitakit_master

[synfig.git] / synfig-core / src / synfig / module.h

diff --git a/synfig-core/src/synfig/module.h b/synfig-core/src/synfig/module.h
index 26638cd..29455e3 100644 (file)
--- a/synfig-core/src/synfig/module.h
+++ b/synfig-core/src/synfig/module.h
@@ -115,10 +115,13 @@
 //! Marks the start of the targets in the module's inventory
 #define BEGIN_TARGETS {
 
-#define TARGET(x)                                                                                                                                                              \
-       synfig::Target::book()[synfig::String(x::name__)]=                                                                                      \
-               std::pair<synfig::Target::Factory,synfig::String>                                                                               \
-                       (x::create,synfig::String(x::ext__));                                                                                           \
+#define TARGET(x)                                                                                                              \
+       synfig::Target::book()[synfig::String(x::name__)].factory =                     \
+               reinterpret_cast<synfig::Target::Factory> (x::create);                  \
+       synfig::Target::book()[synfig::String(x::name__)].filename =            \
+               synfig::String(x::ext__);                                                                               \
+       synfig::Target::book()[synfig::String(x::name__)].target_param =        \
+               synfig::TargetParam();                                                                                                  \
        synfig::Target::ext_book()[synfig::String(x::ext__)]=x::name__;
 
 #define TARGET_EXT(x,y) synfig::Target::ext_book()[synfig::String(y)]=x::name__;