Merge pull request #12 from kalarepa/master

Build as shared library

Author: fallahn

CMakeLists.txt

@@ -3,37 +3,35 @@ cmake_minimum_required(VERSION 2.8)
 include_directories(${CMAKE_SOURCE_DIR}/include)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+
 set(pugi_HDRS
         include/pugixml/pugiconfig.hpp
-        include/pugixml/pugixml.hpp
-)
+        include/pugixml/pugixml.hpp)
 
 set(pugi_SRCS
-        src/pugixml/pugixml.cpp
-)
-
-add_library(pugi ${pugi_HDRS} ${pugi_SRCS})
+        src/pugixml/pugixml.cpp)
 
 set(tmx_HDRS
-
         include/tmx/MapLayer.h
         include/tmx/MapLoader.h
         include/tmx/MapObject.h
         include/tmx/QuadTreeNode.h
-)
+        include/tmx/DebugShape.h
+        include/tmx/Helpers.h)
 
 set(tmx_SRCS
-	src/DebugShape.cpp
+		src/DebugShape.cpp
         src/MapLoaderPublic.cpp
         src/MapLoaderPrivate.cpp
         src/MapLayer.cpp
         src/MapObject.cpp
-        src/QuadTreeNode.cpp
-)
+        src/QuadTreeNode.cpp)
 
-add_library(${PROJECT_NAME} ${tmx_HDRS} ${tmx_SRCS})
+add_library(pugi SHARED ${pugi_HDRS} ${pugi_SRCS})
+add_library(${PROJECT_NAME} SHARED ${tmx_HDRS} ${tmx_SRCS})
 install(TARGETS pugi ${PROJECT_NAME} LIBRARY DESTINATION lib)
-install(FILES ${pugi_HDRS} ${tmx_HDRS} DESTINATION include)
+install(FILES ${tmx_HDRS} DESTINATION include/tmx)
+install(FILES ${pugi_HDRS} DESTINATION include/pugixml)
 
 FILE(GLOB maps "${CMAKE_CURRENT_SOURCE_DIR}/maps/*")
 install(FILES ${maps} DESTINATION share/tmx/examples/maps)

include/DebugShape.h renamed to include/tmx/DebugShape.h

@@ -49,8 +49,8 @@ it freely, subject to the following restrictions:
 
 #include <SFML/System/NonCopyable.hpp>
 
-#include <Helpers.h>
-#include <DebugShape.h>
+#include <tmx/Helpers.h>
+#include <tmx/DebugShape.h>
 
 namespace tmx
 {
@@ -200,4 +200,4 @@ namespace tmx
 	typedef std::vector<MapTile> MapTiles;
 };
 
-#endif //MAP_OBJECT_H
+#endif //MAP_OBJECT_H

include/Helpers.h renamed to include/tmx/Helpers.h

@@ -27,7 +27,7 @@ and must not be misrepresented as being the original software.
 source distribution.
 *********************************************************************/
 
-#include <DebugShape.h>
+#include <tmx/DebugShape.h>
 #include <SFML/Graphics/RenderTarget.hpp>
 
 DebugShape::DebugShape()
@@ -70,4 +70,4 @@ void DebugShape::draw(sf::RenderTarget& rt, sf::RenderStates states) const
 {
 	states.transform *= getTransform();
 	rt.draw(m_array, states);
-}
+}