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

Remove TinyXML-1

Browse Source 
This removes the TinyXML source files, removes it from CMakeLists.txt,
removes all the includes, and removes the functions
FILESYSTEM_saveTiXmlDocument() and FILESYSTEM_loadTiXmlDocument() (use
FILESYSTEM_saveTiXml2Document() and FILESYSTEM_loadTiXml2Document()
instead).

Additionally I've cleaned up the tinyxml2.h include in FileSystemUtils.h
so that it doesn't actually include tinyxml2.h unnecessarily, meaning a
change to TinyXML2 shouldn't rebuild all files that include
FileSystemUtils.h.
This commit is contained in:
Misa
2020-06-03 19:37:01 -07:00
committed by Ethan Lee
parent c397c898fc
commit 3f4df82583
13 changed files with 4 additions and 6373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
desktop_version/CMakeLists.txt
View File

@@ -68,7 +68,6 @@ ENDIF()
# Include Directories
INCLUDE_DIRECTORIES(
src
../third_party/tinyxml
../third_party/tinyxml2
../third_party/physfs
../third_party/lodepng
@@ -121,12 +120,6 @@ IF(GOG)
ADD_DEFINITIONS(-DGOG_NETWORK)
ENDIF()
SET(XML_SRC
../third_party/tinyxml/tinystr.cpp
../third_party/tinyxml/tinyxml.cpp
../third_party/tinyxml/tinyxmlerror.cpp
../third_party/tinyxml/tinyxmlparser.cpp
)
SET(XML2_SRC
../third_party/tinyxml2/tinyxml2.cpp
)
@@ -193,13 +186,12 @@ SET_PROPERTY(TARGET VVVVVV PROPERTY CXX_STANDARD 98)
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 tinyxml2-static lodepng-static)
TARGET_LINK_LIBRARIES(VVVVVV physfs-static tinyxml2-static lodepng-static)
# SDL2 Dependency (Detection pulled from FAudio)
if (DEFINED SDL2_INCLUDE_DIRS AND DEFINED SDL2_LIBRARIES)