Skip to content

Commit a31a062

Browse files
authored
Add submodule of TinyXML-2 (#7)
* add submodule of tinyxml2 and fix build * fix bugs in loading xml * remove tinyxml and update README * clean up cmake
1 parent a4e45bd commit a31a062

28 files changed

+140
-8347
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@
2828
*.app
2929

3030
build
31+
bin

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "3rdparty/clipper"]
22
path = 3rdparty/clipper
33
url = https://github.com/skyrpex/clipper.git
4+
[submodule "3rdparty/tinyxml2"]
5+
path = 3rdparty/tinyxml2
6+
url = https://github.com/leethomason/tinyxml2.git

3rdparty/CMakeLists.txt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,2 @@
1-
# ADD_SUBDIRECTORY(clipper/cpp)
2-
SET(CLIPPER_FOLDER clipper/cpp)
3-
FILE(GLOB CLIPPER_SOURCES ${CLIPPER_FOLDER}/*.cpp)
4-
FILE(GLOB CLIPPER_HEADERS ${CLIPPER_FOLDER}/*.hpp)
5-
6-
ADD_LIBRARY(polyclipping STATIC ${CLIPPER_SOURCES} ${CLIPPER_HEADERS})
1+
ADD_LIBRARY(polyclipping STATIC clipper/cpp/clipper.cpp clipper/cpp/clipper.hpp)
2+
ADD_LIBRARY(tinyxml2 STATIC tinyxml2/tinyxml2.cpp tinyxml2/tinyxml2.h)

3rdparty/tinyxml2

Submodule tinyxml2 added at 1aeb57d

CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
22
PROJECT(LevelSyn)
33

4-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${CMAKE_SOURCE_DIR}/bin>)
5-
64
ADD_SUBDIRECTORY(3rdparty)
7-
ADD_SUBDIRECTORY(lib)
85
ADD_SUBDIRECTORY(src)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ This repository contains the source code and example data of the following publi
2222

2323
The code is cross-platform and has been tested under Windows (MSVC), Linux and Mac OS X. Compiling from scratch requires the installation of [CMake](https://cmake.org/) and [Boost C++ Libraries](http://www.boost.org/). Additional dependencies (already included in this repo) are:
2424
* [Clipper 6.4.2](https://github.com/skyrpex/clipper) for polygon intersection computation
25-
* [tinyxml 2.6.2](http://www.grinninglizard.com/tinyxml/) for xml parsing
25+
* [TinyXML-2](https://github.com/leethomason/tinyxml2) for xml parsing
2626

2727
## Usage
2828

lib/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

lib/tinyxml/CMakeLists.txt

Lines changed: 0 additions & 29 deletions
This file was deleted.

lib/tinyxml/Makefile

Lines changed: 0 additions & 130 deletions
This file was deleted.

0 commit comments

Comments
 (0)