瀏覽代碼

Merge pull request #486 from tsteinholz/master

[SFML] Fixed include statments
John 9 年之前
父節點
當前提交
18850d9830
共有 2 個文件被更改,包括 4 次插入6 次删除
  1. 0 6
      spine-sfml/src/spine/spine-sfml.cpp
  2. 4 0
      spine-sfml/src/spine/spine-sfml.h

+ 0 - 6
spine-sfml/src/spine/spine-sfml.cpp

@@ -30,12 +30,6 @@
  *****************************************************************************/
 
 #include <spine/spine-sfml.h>
-#include <spine/extension.h>
-#include <SFML/Graphics/Vertex.hpp>
-#include <SFML/Graphics/VertexArray.hpp>
-#include <SFML/Graphics/Texture.hpp>
-#include <SFML/Graphics/RenderTarget.hpp>
-#include <SFML/Graphics/RenderStates.hpp>
 
 #ifndef SPINE_MESH_VERTEX_COUNT_MAX
 #define SPINE_MESH_VERTEX_COUNT_MAX 1000

+ 4 - 0
spine-sfml/src/spine/spine-sfml.h

@@ -34,8 +34,12 @@
 
 #define SPINE_SHORT_NAMES
 #include <spine/spine.h>
+#include <spine/extension.h>
 #include <SFML/Graphics/Vertex.hpp>
 #include <SFML/Graphics/VertexArray.hpp>
+#include <SFML/Graphics/Texture.hpp>
+#include <SFML/Graphics/RenderTarget.hpp>
+#include <SFML/Graphics/RenderStates.hpp>
 
 namespace spine {