Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-01-29 17:38:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add TinyXML2

Browse Source 
This adds the TinyXML2 files, as well as updates them in CMakeLists.txt
so it will be compiled in, too. Temporarily, the old TinyXML is kept for
now.
This commit is contained in:
Misa
2020-06-03 09:42:42 -07:00
committed by Ethan Lee
parent 628eb7b7bf
commit b67ac8a43b
5 changed files with 5679 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
desktop_version/CMakeLists.txt
View File

@@ -69,6 +69,7 @@ ENDIF()
INCLUDE_DIRECTORIES(
src
../third_party/tinyxml
../third_party/tinyxml2
../third_party/physfs
../third_party/lodepng
../third_party/utfcpp/source
@@ -126,6 +127,9 @@ SET(XML_SRC
../third_party/tinyxml/tinyxmlerror.cpp
../third_party/tinyxml/tinyxmlparser.cpp
)
SET(XML2_SRC
../third_party/tinyxml2/tinyxml2.cpp
)
SET(PFS_SRC
../third_party/physfs/physfs.c
../third_party/physfs/physfs_archiver_dir.c
@@ -190,11 +194,12 @@ SET_PROPERTY(TARGET VVVVVV PROPERTY CXX_EXTENSIONS FALSE)
# Library information
ADD_LIBRARY(tinyxml-static STATIC ${XML_SRC})
ADD_LIBRARY(tinyxml2-static STATIC ${XML2_SRC})
ADD_LIBRARY(physfs-static STATIC ${PFS_SRC} ${PFSP_SRC})
ADD_LIBRARY(lodepng-static STATIC ${PNG_SRC})
# Static Dependencies
TARGET_LINK_LIBRARIES(VVVVVV physfs-static tinyxml-static lodepng-static)
TARGET_LINK_LIBRARIES(VVVVVV physfs-static tinyxml-static tinyxml2-static lodepng-static)
# SDL2 Dependency (Detection pulled from FAudio)
if (DEFINED SDL2_INCLUDE_DIRS AND DEFINED SDL2_LIBRARIES)