Refactor (#4)

* refactor lib and src * fix build * fix build
chongyangma · Apr 22, 2018 · adf6bbc · adf6bbc
1 parent c59d3d2
commit adf6bbc
Show file tree

Hide file tree

Showing 58 changed files with 44 additions and 82 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -39,5 +39,5 @@ build:
 #  verbosity: quiet
 
 after_build:
-    - cd C:\projects\LevelSyn\build\Release
-    - levels.exe ..\..\data\planar_graph_fig1.xml ..\..\data\building_blocks_fig1.xml ..\..\data\config.txt 10
+    - cd C:\projects\LevelSyn\build\src\Release
+    - levels.exe ..\..\..\data\planar_graph_fig1.xml ..\..\..\data\building_blocks_fig1.xml ..\..\..\data\config.txt 10
diff --git a/.travis.yml b/.travis.yml
@@ -20,4 +20,4 @@ before_script:
 
 script:
     - make
-    - ./levels ../data/planar_graph_fig1.xml ../data/building_blocks_fig1.xml ../data/config.txt 10
+    - ./src/levels ../data/planar_graph_fig1.xml ../data/building_blocks_fig1.xml ../data/config.txt 10
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,61 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(LevelSyn)
 
-if(MSVC)
-#   set( BOOST_ROOT "C:/Program Files/boost/boost_1_54_0")
-#   set( BOOST_LIBRARYDIR "C:/Program Files/boost/boost_1_54_0/lib64-msvc-10.0" )
-endif()
-
-SET(Boost_USE_STATIC_LIBS TRUE)
-FIND_PACKAGE( Boost COMPONENTS thread REQUIRED )
-LINK_DIRECTORIES    ( ${Boost_LIBRARY_DIRS} )
-INCLUDE_DIRECTORIES ( ${Boost_INCLUDE_DIRS} )
-
-if(APPLE)
-   FIND_LIBRARY( coreFoundation CoreFoundation )
-endif()
-
-ADD_SUBDIRECTORY( tinyxml )
-INCLUDE_DIRECTORIES ( tinyxml )
-INCLUDE_DIRECTORIES ( clipper )
-
-SET(SOURCES
-	clipper/clipper.cpp
-	code/PlanarGraph.cpp
-	code/Room.cpp
-	code/RoomTemplates.cpp
-	code/RoomLayout.cpp
-	code/LevelSynth.cpp
-	code/LevelConfig.cpp
-	code/LevelMath.cpp
-	code/clipperWrapper.cpp
-	code/ConfigSpace.cpp
-)
-
-SET(HEADERS
-	clipper/clipper.hpp
-	code/GraphChain.h
-	code/GraphEdge.h
-	code/GraphFace.h
-	code/GraphNode.h
-	code/LineBase.h
-	code/PlanarGraph.h
-	code/Room.h
-	code/RoomTemplates.h
-	code/RoomLayout.h
-	code/RoomEdge.h
-	code/LevelSynth.h
-	code/LevelConfig.h
-	code/LevelMath.h
-	code/LevelTimer.h
-	code/clipperWrapper.h
-	code/ConfigSpace.h
-	code/util.h
-	code/vec.h
-)
-
-ADD_EXECUTABLE( levels code/levels.cpp ${SOURCES} ${HEADERS} )
-TARGET_LINK_LIBRARIES( levels tinyxml ${Boost_LIBRARIES} ${Boost_THREAD_LIBRARY} )
-if(APPLE)
-   TARGET_LINK_LIBRARIES( levels ${coreFoundation} )
-endif()
+ADD_SUBDIRECTORY(lib)
+ADD_SUBDIRECTORY(src)
diff --git a/clipper/CMakeLists.txt b/clipper/CMakeLists.txt
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -0,0 +1,2 @@
+ADD_SUBDIRECTORY(clipper)
+ADD_SUBDIRECTORY(tinyxml)
diff --git a/lib/clipper/CMakeLists.txt b/lib/clipper/CMakeLists.txt
@@ -0,0 +1,7 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
+PROJECT(clipper)
+
+FILE(GLOB CLIPPER_SOURCES *.cpp)
+FILE(GLOB CLIPPER_HEADERS *.hpp)
+
+ADD_LIBRARY(clipper STATIC ${CLIPPER_SOURCES} ${CLIPPER_HEADERS})
diff --git a/clipper/License.txt → lib/clipper/License.txt b/clipper/License.txt → lib/clipper/License.txt
diff --git a/clipper/README → lib/clipper/README b/clipper/README → lib/clipper/README
diff --git a/clipper/clipper.cpp → lib/clipper/clipper.cpp b/clipper/clipper.cpp → lib/clipper/clipper.cpp
diff --git a/clipper/clipper.hpp → lib/clipper/clipper.hpp b/clipper/clipper.hpp → lib/clipper/clipper.hpp
diff --git a/tinyxml/CMakeLists.txt → lib/tinyxml/CMakeLists.txt b/tinyxml/CMakeLists.txt → lib/tinyxml/CMakeLists.txt
diff --git a/tinyxml/Makefile → lib/tinyxml/Makefile b/tinyxml/Makefile → lib/tinyxml/Makefile
diff --git a/tinyxml/changes.txt → lib/tinyxml/changes.txt b/tinyxml/changes.txt → lib/tinyxml/changes.txt
diff --git a/tinyxml/readme.txt → lib/tinyxml/readme.txt b/tinyxml/readme.txt → lib/tinyxml/readme.txt
diff --git a/tinyxml/tinyXmlTest.vcxproj → lib/tinyxml/tinyXmlTest.vcxproj b/tinyxml/tinyXmlTest.vcxproj → lib/tinyxml/tinyXmlTest.vcxproj
diff --git a/tinyxml/tinyXmlTestSTL.vcxproj → lib/tinyxml/tinyXmlTestSTL.vcxproj b/tinyxml/tinyXmlTestSTL.vcxproj → lib/tinyxml/tinyXmlTestSTL.vcxproj
diff --git a/tinyxml/tinystr.cpp → lib/tinyxml/tinystr.cpp b/tinyxml/tinystr.cpp → lib/tinyxml/tinystr.cpp
diff --git a/tinyxml/tinystr.h → lib/tinyxml/tinystr.h b/tinyxml/tinystr.h → lib/tinyxml/tinystr.h
diff --git a/tinyxml/tinyxml.cpp → lib/tinyxml/tinyxml.cpp b/tinyxml/tinyxml.cpp → lib/tinyxml/tinyxml.cpp
diff --git a/tinyxml/tinyxml.h → lib/tinyxml/tinyxml.h b/tinyxml/tinyxml.h → lib/tinyxml/tinyxml.h
diff --git a/tinyxml/tinyxml.sln → lib/tinyxml/tinyxml.sln b/tinyxml/tinyxml.sln → lib/tinyxml/tinyxml.sln
diff --git a/tinyxml/tinyxmlSTL.vcxproj → lib/tinyxml/tinyxmlSTL.vcxproj b/tinyxml/tinyxmlSTL.vcxproj → lib/tinyxml/tinyxmlSTL.vcxproj
diff --git a/tinyxml/tinyxml_lib.vcxproj → lib/tinyxml/tinyxml_lib.vcxproj b/tinyxml/tinyxml_lib.vcxproj → lib/tinyxml/tinyxml_lib.vcxproj
diff --git a/tinyxml/tinyxmlerror.cpp → lib/tinyxml/tinyxmlerror.cpp b/tinyxml/tinyxmlerror.cpp → lib/tinyxml/tinyxmlerror.cpp
diff --git a/tinyxml/tinyxmlparser.cpp → lib/tinyxml/tinyxmlparser.cpp b/tinyxml/tinyxmlparser.cpp → lib/tinyxml/tinyxmlparser.cpp
diff --git a/tinyxml/utf8test.gif → lib/tinyxml/utf8test.gif b/tinyxml/utf8test.gif → lib/tinyxml/utf8test.gif
diff --git a/tinyxml/utf8test.xml → lib/tinyxml/utf8test.xml b/tinyxml/utf8test.xml → lib/tinyxml/utf8test.xml
diff --git a/tinyxml/utf8testverify.xml → lib/tinyxml/utf8testverify.xml b/tinyxml/utf8testverify.xml → lib/tinyxml/utf8testverify.xml
diff --git a/tinyxml/xmltest.cpp → lib/tinyxml/xmltest.cpp b/tinyxml/xmltest.cpp → lib/tinyxml/xmltest.cpp
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -0,0 +1,30 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+PROJECT(LevenSyn)
+
+IF(MSVC)
+#   set( BOOST_ROOT "C:/Program Files/boost/boost_1_54_0")
+#   set( BOOST_LIBRARYDIR "C:/Program Files/boost/boost_1_54_0/lib64-msvc-10.0" )
+ENDIF()
+
+SET(Boost_USE_STATIC_LIBS TRUE)
+FIND_PACKAGE(Boost COMPONENTS thread REQUIRED)
+LINK_DIRECTORIES    (${Boost_LIBRARY_DIRS})
+INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS})
+
+IF(APPLE)
+   FIND_LIBRARY(coreFoundation CoreFoundation)
+ENDIF()
+
+FILE(GLOB LEVEL_SYN_SOURCES "*.cpp")
+FILE(GLOB LEVEL_SYN_HEADERS "*.h")
+
+INCLUDE_DIRECTORIES (../lib/clipper)
+INCLUDE_DIRECTORIES (../lib/tinyxml)
+
+LINK_DIRECTORIES(${PROJECT_BINARY_DIR}/../lib)
+
+ADD_EXECUTABLE(levels ${LEVEL_SYN_SOURCES} ${LEVEL_SYN_HEADERS})
+TARGET_LINK_LIBRARIES(levels tinyxml clipper ${Boost_LIBRARIES} ${Boost_THREAD_LIBRARY})
+if(APPLE)
+   TARGET_LINK_LIBRARIES(levels ${coreFoundation})
+endif()
diff --git a/code/ConfigSpace.cpp → src/ConfigSpace.cpp b/code/ConfigSpace.cpp → src/ConfigSpace.cpp
diff --git a/code/ConfigSpace.h → src/ConfigSpace.h b/code/ConfigSpace.h → src/ConfigSpace.h
diff --git a/code/GraphChain.h → src/GraphChain.h b/code/GraphChain.h → src/GraphChain.h
diff --git a/code/GraphEdge.h → src/GraphEdge.h b/code/GraphEdge.h → src/GraphEdge.h
diff --git a/code/GraphFace.h → src/GraphFace.h b/code/GraphFace.h → src/GraphFace.h
diff --git a/code/GraphNode.h → src/GraphNode.h b/code/GraphNode.h → src/GraphNode.h
diff --git a/code/LevelConfig.cpp → src/LevelConfig.cpp b/code/LevelConfig.cpp → src/LevelConfig.cpp
diff --git a/code/LevelConfig.h → src/LevelConfig.h b/code/LevelConfig.h → src/LevelConfig.h
diff --git a/code/LevelMath.cpp → src/LevelMath.cpp b/code/LevelMath.cpp → src/LevelMath.cpp
diff --git a/code/LevelMath.h → src/LevelMath.h b/code/LevelMath.h → src/LevelMath.h
diff --git a/code/LevelSynth.cpp → src/LevelSynth.cpp b/code/LevelSynth.cpp → src/LevelSynth.cpp
diff --git a/code/LevelSynth.h → src/LevelSynth.h b/code/LevelSynth.h → src/LevelSynth.h
diff --git a/code/LevelTimer.h → src/LevelTimer.h b/code/LevelTimer.h → src/LevelTimer.h
diff --git a/code/LineBase.h → src/LineBase.h b/code/LineBase.h → src/LineBase.h
diff --git a/code/PlanarGraph.cpp → src/PlanarGraph.cpp b/code/PlanarGraph.cpp → src/PlanarGraph.cpp
diff --git a/code/PlanarGraph.h → src/PlanarGraph.h b/code/PlanarGraph.h → src/PlanarGraph.h
diff --git a/code/Room.cpp → src/Room.cpp b/code/Room.cpp → src/Room.cpp
diff --git a/code/Room.h → src/Room.h b/code/Room.h → src/Room.h
diff --git a/code/RoomEdge.h → src/RoomEdge.h b/code/RoomEdge.h → src/RoomEdge.h
diff --git a/code/RoomLayout.cpp → src/RoomLayout.cpp b/code/RoomLayout.cpp → src/RoomLayout.cpp
diff --git a/code/RoomLayout.h → src/RoomLayout.h b/code/RoomLayout.h → src/RoomLayout.h
diff --git a/code/RoomTemplates.cpp → src/RoomTemplates.cpp b/code/RoomTemplates.cpp → src/RoomTemplates.cpp
diff --git a/code/RoomTemplates.h → src/RoomTemplates.h b/code/RoomTemplates.h → src/RoomTemplates.h
diff --git a/code/clipperWrapper.cpp → src/clipperWrapper.cpp b/code/clipperWrapper.cpp → src/clipperWrapper.cpp
diff --git a/code/clipperWrapper.h → src/clipperWrapper.h b/code/clipperWrapper.h → src/clipperWrapper.h
diff --git a/code/levels.cpp → src/levels.cpp b/code/levels.cpp → src/levels.cpp
diff --git a/code/util.h → src/util.h b/code/util.h → src/util.h
diff --git a/code/vec.h → src/vec.h b/code/vec.h → src/vec.h