forked from bartvdbraak/blender
14882c4bed
Was caused by "wrong" EOL characters used in the patch: the file is actuallyu saved using CRLF EOL style. The patch was using CRLF as well for until recent change in the C runtime.
77 lines
2.6 KiB
Diff
77 lines
2.6 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
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)
|
|
diff --git a/DAEValidator/library/include/no_warning_begin b/DAEValidator/library/include/no_warning_begin
|
|
index 7a69c32..defb315 100644
|
|
--- a/DAEValidator/library/include/no_warning_begin
|
|
+++ b/DAEValidator/library/include/no_warning_begin
|
|
@@ -2,6 +2,9 @@
|
|
#if defined(_WIN32)
|
|
# pragma warning(push)
|
|
# pragma warning(disable:4668)
|
|
+# if _MSC_VER >=1900
|
|
+# pragma warning(disable:5031)
|
|
+# endif
|
|
# if defined(_MSC_VER) && defined(_DEBUG)
|
|
# pragma warning(disable:4548)
|
|
# endif
|
|
diff --git a/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp b/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp
|
|
index 1f9a3ee..d151e9a 100644
|
|
--- a/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp
|
|
+++ b/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp
|
|
@@ -1553,7 +1553,7 @@ namespace GeneratedSaxParser
|
|
#if defined(COLLADABU_OS_WIN) && !defined(__MINGW32__)
|
|
return _isnan( value ) ? true : false;
|
|
#else
|
|
-#ifdef isnan
|
|
+#if defined(isnan) || defined(__APPLE__)
|
|
return isnan( value );
|
|
#else
|
|
return std::isnan(value);
|
|
diff --git a/DAEValidator/CMakeLists.txt b/DAEValidator/CMakeLists.txt
|
|
index 03ad540f..f7d05cfb 100644
|
|
--- a/DAEValidator/CMakeLists.txt
|
|
+++ b/DAEValidator/CMakeLists.txt
|
|
@@ -98,7 +98,7 @@ if (WIN32)
|
|
# C4710: 'function' : function not inlined
|
|
# C4711: function 'function' selected for inline expansion
|
|
# C4820: 'bytes' bytes padding added after construct 'member_name'
|
|
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /Wall /WX /wd4505 /wd4514 /wd4592 /wd4710 /wd4711 /wd4820")
|
|
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /Wall /wd4505 /wd4514 /wd4592 /wd4710 /wd4711 /wd4820")
|
|
else ()
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Werror")
|
|
endif ()
|
|
diff --git a/DAEValidator/library/src/ArgumentParser.cpp b/DAEValidator/library/src/ArgumentParser.cpp
|
|
index 897e4dcf..98a69ff1 100644
|
|
--- a/DAEValidator/library/src/ArgumentParser.cpp
|
|
+++ b/DAEValidator/library/src/ArgumentParser.cpp
|
|
@@ -6,10 +6,10 @@
|
|
|
|
using namespace std;
|
|
|
|
-#ifdef _MSC_VER
|
|
-#define NOEXCEPT _NOEXCEPT
|
|
-#else
|
|
+#ifndef _NOEXCEPT
|
|
#define NOEXCEPT noexcept
|
|
+#else
|
|
+#define NOEXCEPT _NOEXCEPT
|
|
#endif
|
|
|
|
namespace opencollada
|