SHARE
TWEET

Untitled

a guest Feb 20th, 2014 169 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff -Naur cegui-0.8.3/cegui/include/CEGUI/falagard/FormattingSetting.h cegui-0.8.3_/cegui/include/CEGUI/falagard/FormattingSetting.h
  2. --- cegui-0.8.3/cegui/include/CEGUI/falagard/FormattingSetting.h        Sat Dec  7 08:37:08 2013
  3. +++ cegui-0.8.3_/cegui/include/CEGUI/falagard/FormattingSetting.h       Mon Feb 10 14:06:24 2014
  4. @@ -121,22 +121,8 @@
  5.      String d_propertySource;
  6.  };
  7.  
  8. -template<> void CEGUIEXPORT FormattingSetting<VerticalFormatting>::writeXMLTagToStream(
  9. -                                            XMLSerializer& xml_stream) const;
  10. -template<> void CEGUIEXPORT FormattingSetting<VerticalFormatting>::writeXMLAttributesToStream(
  11. -                                            XMLSerializer& xml_stream) const;
  12. -template<> void CEGUIEXPORT FormattingSetting<HorizontalFormatting>::writeXMLTagToStream(
  13. -                                            XMLSerializer& xml_stream) const;
  14. -template<> void CEGUIEXPORT FormattingSetting<HorizontalFormatting>::writeXMLAttributesToStream(
  15. -                                            XMLSerializer& xml_stream) const;
  16. -template<> void CEGUIEXPORT FormattingSetting<VerticalTextFormatting>::writeXMLTagToStream(
  17. -                                            XMLSerializer& xml_stream) const;
  18. -template<> void CEGUIEXPORT FormattingSetting<VerticalTextFormatting>::writeXMLAttributesToStream(
  19. -                                            XMLSerializer& xml_stream) const;
  20. -template<> void CEGUIEXPORT FormattingSetting<HorizontalTextFormatting>::writeXMLTagToStream(
  21. -                                            XMLSerializer& xml_stream) const;
  22. -template<> void CEGUIEXPORT FormattingSetting<HorizontalTextFormatting>::writeXMLAttributesToStream(
  23. -                                            XMLSerializer& xml_stream) const;
  24. +template class FormattingSetting<VerticalFormatting>;
  25. +template class FormattingSetting<HorizontalFormatting>;
  26.  }
  27.  
  28.  #endif
  29. diff -Naur cegui-0.8.3/cegui/src/Scheme.cpp cegui-0.8.3_/cegui/src/Scheme.cpp
  30. --- cegui-0.8.3/cegui/src/Scheme.cpp    Sat Dec  7 08:37:08 2013
  31. +++ cegui-0.8.3_/cegui/src/Scheme.cpp   Mon Feb 10 14:31:23 2014
  32. @@ -62,7 +62,13 @@
  33.  // Start of CEGUI namespace section
  34.  namespace CEGUI
  35.  {
  36. -
  37. +       extern "C" {
  38. +               CEGUI::FactoryModule& getWindowFactoryModule()
  39. +               {
  40. +                       static CEGUI::FactoryModule mod;
  41. +                       return mod;
  42. +               }
  43. +       }
  44.  /*************************************************************************
  45.      Static Data definitions
  46.  *************************************************************************/
  47. diff -Naur cegui-0.8.3/cegui/src/ScriptModules/Lua/support/tolua++bin/CMakeLists.txt cegui-0.8.3_/cegui/src/ScriptModules/Lua/support/tolua++bin/CMakeLists.txt
  48. --- cegui-0.8.3/cegui/src/ScriptModules/Lua/support/tolua++bin/CMakeLists.txt   Thu Feb 20 01:40:55 2014
  49. +++ cegui-0.8.3_/cegui/src/ScriptModules/Lua/support/tolua++bin/CMakeLists.txt  Sat Feb  1 22:32:27 2014
  50. @@ -16,6 +16,7 @@
  51.  if (CEGUI_BUILD_STATIC_CONFIGURATION)
  52.      add_executable(${CEGUI_TARGET_NAME}_Static ${CORE_SOURCE_FILES})
  53. +    add_definitions(-DTOLUA_STATIC)
  54.      if (CEGUI_HAS_BUILD_SUFFIX AND CEGUI_BUILD_SUFFIX)
  55.          set_target_properties(${CEGUI_TARGET_NAME}_Static PROPERTIES
  56.              OUTPUT_NAME_DEBUG "${CEGUI_TARGET_NAME}_Static${CEGUI_BUILD_SUFFIX}"
  57. diff -Naur cegui-0.8.3/cegui/src/falagard/FormattingSetting.cpp cegui-0.8.3_/cegui/src/falagard/FormattingSetting.cpp
  58. --- cegui-0.8.3/cegui/src/falagard/FormattingSetting.cpp        Sat Dec  7 08:37:10 2013
  59. +++ cegui-0.8.3_/cegui/src/falagard/FormattingSetting.cpp       Mon Feb 10 14:06:30 2014
  60. @@ -29,91 +29,6 @@
  61.  
  62.  namespace CEGUI
  63.  {
  64. -//----------------------------------------------------------------------------//
  65. -template<>
  66. -void FormattingSetting<VerticalFormatting>::writeXMLTagToStream(XMLSerializer& xml_stream) const
  67. -{
  68. -    if (d_propertySource.empty())
  69. -        xml_stream.openTag("VertFormat");
  70. -    else
  71. -        xml_stream.openTag("VertFormatProperty");
  72. -}
  73. -
  74. -//----------------------------------------------------------------------------//
  75. -template<>
  76. -void FormattingSetting<VerticalFormatting>::writeXMLAttributesToStream(XMLSerializer& xml_stream) const
  77. -{
  78. -    if (d_propertySource.empty())
  79. -        xml_stream.attribute("type",
  80. -            FalagardXMLHelper<VerticalFormatting>::toString(d_value));
  81. -    else
  82. -        xml_stream.attribute("name", d_propertySource);
  83. -}
  84. -
  85. -//----------------------------------------------------------------------------//
  86. -template<>
  87. -void FormattingSetting<HorizontalFormatting>::writeXMLTagToStream(XMLSerializer& xml_stream) const
  88. -{
  89. -    if (d_propertySource.empty())
  90. -        xml_stream.openTag("HorzFormat");
  91. -    else
  92. -        xml_stream.openTag("HorzFormatProperty");
  93. -}
  94. -
  95. -//----------------------------------------------------------------------------//
  96. -template<>
  97. -void FormattingSetting<HorizontalFormatting>::writeXMLAttributesToStream(XMLSerializer& xml_stream) const
  98. -{
  99. -    if (d_propertySource.empty())
  100. -        xml_stream.attribute("type",
  101. -            FalagardXMLHelper<HorizontalFormatting>::toString(d_value));
  102. -    else
  103. -        xml_stream.attribute("name", d_propertySource);
  104. -}
  105. -
  106. -//----------------------------------------------------------------------------//
  107. -template<>
  108. -void FormattingSetting<VerticalTextFormatting>::writeXMLTagToStream(XMLSerializer& xml_stream) const
  109. -{
  110. -    if (d_propertySource.empty())
  111. -        xml_stream.openTag("VertFormat");
  112. -    else
  113. -        xml_stream.openTag("VertFormatProperty");
  114. -}
  115. -
  116. -//----------------------------------------------------------------------------//
  117. -template<>
  118. -void FormattingSetting<VerticalTextFormatting>::writeXMLAttributesToStream(XMLSerializer& xml_stream) const
  119. -{
  120. -    if (d_propertySource.empty())
  121. -        xml_stream.attribute("type",
  122. -            FalagardXMLHelper<VerticalTextFormatting>::toString(d_value));
  123. -    else
  124. -        xml_stream.attribute("name", d_propertySource);
  125. -}
  126. -
  127. -//----------------------------------------------------------------------------//
  128. -template<>
  129. -void FormattingSetting<HorizontalTextFormatting>::writeXMLTagToStream(XMLSerializer& xml_stream) const
  130. -{
  131. -    if (d_propertySource.empty())
  132. -        xml_stream.openTag("HorzFormat");
  133. -    else
  134. -        xml_stream.openTag("HorzFormatProperty");
  135. -}
  136. -
  137. -//----------------------------------------------------------------------------//
  138. -template<>
  139. -void FormattingSetting<HorizontalTextFormatting>::writeXMLAttributesToStream(XMLSerializer& xml_stream) const
  140. -{
  141. -    if (d_propertySource.empty())
  142. -        xml_stream.attribute("type",
  143. -            FalagardXMLHelper<HorizontalTextFormatting>::toString(d_value));
  144. -    else
  145. -        xml_stream.attribute("name", d_propertySource);
  146. -}
  147. -
  148. -//----------------------------------------------------------------------------//
  149.  
  150.  }
RAW Paste Data
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy. OK, I Understand
Top