diff options
Diffstat (limited to 'build_files/build_environment/patches/opencollada.diff')
| -rw-r--r-- | build_files/build_environment/patches/opencollada.diff | 52 |
1 files changed, 32 insertions, 20 deletions
diff --git a/build_files/build_environment/patches/opencollada.diff b/build_files/build_environment/patches/opencollada.diff index 02eab251a13..edb831dc20f 100644 --- a/build_files/build_environment/patches/opencollada.diff +++ b/build_files/build_environment/patches/opencollada.diff @@ -3,19 +3,19 @@ index 95abbe2..4f14f30 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -254,11 +254,11 @@ if(USE_STATIC_MSVC_RUNTIME) - endif()
-
- #adding PCRE
--find_package(PCRE)
-+#find_package(PCRE)
- if (PCRE_FOUND)
- message(STATUS "SUCCESSFUL: PCRE found")
- else () # if pcre not found building its local copy from ./Externals
-- if (WIN32 OR APPLE)
-+ if (1)
- message("WARNING: Native PCRE not found, taking PCRE from ./Externals")
- add_definitions(-DPCRE_STATIC)
- add_subdirectory(${EXTERNAL_LIBRARIES}/pcre)
+ endif() + + #adding PCRE +-find_package(PCRE) ++#find_package(PCRE) + if (PCRE_FOUND) + message(STATUS "SUCCESSFUL: PCRE found") + else () # if pcre not found building its local copy from ./Externals +- if (WIN32 OR APPLE) ++ if (1) + message("WARNING: Native PCRE not found, taking PCRE from ./Externals") + add_definitions(-DPCRE_STATIC) + add_subdirectory(${EXTERNAL_LIBRARIES}/pcre) diff --git a/DAEValidator/CMakeLists.txt b/DAEValidator/CMakeLists.txt index 03ad540..f7d05cf 100644 --- a/DAEValidator/CMakeLists.txt @@ -66,13 +66,13 @@ index 40081e7..e1d1bfa 100644 --- a/Externals/LibXML/CMakeLists.txt +++ b/Externals/LibXML/CMakeLists.txt @@ -9,6 +9,7 @@ add_definitions( - -DLIBXML_SCHEMAS_ENABLED
- -DLIBXML_XPATH_ENABLED
- -DLIBXML_TREE_ENABLED
-+ -DLIBXML_STATIC
- )
-
- if(USE_STATIC_MSVC_RUNTIME)
+ -DLIBXML_SCHEMAS_ENABLED + -DLIBXML_XPATH_ENABLED + -DLIBXML_TREE_ENABLED ++ -DLIBXML_STATIC + ) + + if(USE_STATIC_MSVC_RUNTIME) diff --git a/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp b/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp index 1f9a3ee..d151e9a 100644 --- a/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp @@ -155,3 +155,15 @@ diff -Naur a/CMakeLists.txt b/CMakeLists.txt # Library export install(EXPORT LibraryExport DESTINATION ${OPENCOLLADA_INST_CMAKECONFIG} FILE OpenCOLLADATargets.cmake) +diff -Naur OpenCOLLADA-1.6.68/common/libBuffer/include/CommonFWriteBufferFlusher.h external_opencollada/common/libBuffer/include/CommonFWriteBufferFlusher.h +--- OpenCOLLADA-1.6.68/common/libBuffer/include/CommonFWriteBufferFlusher.h 2018-11-26 14:43:10 -0700 ++++ external_opencollada/common/libBuffer/include/CommonFWriteBufferFlusher.h 2022-08-19 11:36:04 -0600 +@@ -23,7 +23,7 @@ + # include <tr1/unordered_map> + #endif + +-#ifdef _LIBCPP_VERSION ++#if defined(_LIBCPP_VERSION) || defined(WIN32) + // If we're compiling with libc++, create a namespace alias for tr1 that points to std. + // Not particularly elegant, and largely should be filed under "hack", but it works for OS X with clang for now. + namespace std {
\ No newline at end of file |