RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 02:32:36 +01:00
Code Issues Releases Wiki Activity

pugixml: update submodule and build integration

Browse Source
This commit is contained in:
scribam 2018-06-07 18:38:19 +02:00 committed by Ivan
parent 83f096c435
commit 3935cef691
5 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/pugixml vendored

@ -1 +1 @@
Subproject commit 257fbb4e1b09b0f1a6b2020ae2db190b87c8f9c7 Subproject commit 8436f2a69b9331f8e99a52772e93ba0dbb68dafe

2
CMakeLists.txt
View File

@ -36,6 +36,8 @@ if (NOT USE_SYSTEM_LIBPNG)
add_subdirectory(3rdparty/libpng EXCLUDE_FROM_ALL) add_subdirectory(3rdparty/libpng EXCLUDE_FROM_ALL)
endif() endif()
add_subdirectory(3rdparty/pugixml EXCLUDE_FROM_ALL)
# TODO: do real installation, including copying directory structure # TODO: do real installation, including copying directory structure
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${PROJECT_BINARY_DIR}/bin") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${PROJECT_BINARY_DIR}/bin")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${PROJECT_BINARY_DIR}/bin") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${PROJECT_BINARY_DIR}/bin")

6
Utilities/rXml.h
View File

@ -1,10 +1,6 @@
#pragma once #pragma once
#ifndef PUGIXML_HEADER_ONLY #include <pugixml.hpp>
#define PUGIXML_HEADER_ONLY 1
#endif // !PUGIXML_HEADER_ONLY
#include "pugixml.hpp"
#undef PUGIXML_HEADER_ONLY
struct rXmlNode struct rXmlNode
{ {

3
rpcs3/CMakeLists.txt
View File

@ -289,7 +289,6 @@ endif()
include_directories( include_directories(
${OPENAL_INCLUDE_DIR} ${OPENAL_INCLUDE_DIR}
${LLVM_INCLUDE_DIRS} ${LLVM_INCLUDE_DIRS}
"${RPCS3_SRC_DIR}/../3rdparty/pugixml/src"
"${RPCS3_SRC_DIR}" "${RPCS3_SRC_DIR}"
"${RPCS3_SRC_DIR}/Loader" "${RPCS3_SRC_DIR}/Loader"
"${RPCS3_SRC_DIR}/Crypto" "${RPCS3_SRC_DIR}/Crypto"
@ -401,7 +400,7 @@ if(VULKAN_FOUND)
target_link_libraries(rpcs3 SPIRV Vulkan::Vulkan) target_link_libraries(rpcs3 SPIRV Vulkan::Vulkan)
endif() endif()
target_link_libraries(rpcs3 xxhash yaml-cpp) target_link_libraries(rpcs3 pugixml xxhash yaml-cpp)
if(WIN32) if(WIN32)
target_link_libraries(rpcs3 ws2_32.lib Winmm.lib Psapi.lib gdi32.lib setupapi.lib hidapi-hid Shlwapi.lib) target_link_libraries(rpcs3 ws2_32.lib Winmm.lib Psapi.lib gdi32.lib setupapi.lib hidapi-hid Shlwapi.lib)

1
rpcs3_default.props
View File

@ -13,6 +13,7 @@
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
</Lib> </Lib>
<ClCompile> <ClCompile>
<PreprocessorDefinitions>PUGIXML_HEADER_ONLY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<SDLCheck>false</SDLCheck> <SDLCheck>false</SDLCheck>