diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-08-10 16:43:52 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-08-10 16:43:52 +0300 |
| commit | 496b510438b2f994cafcec6e36fe300be9fe015f (patch) | |
| tree | 426f0e61c752535d2231459bcd2152c95c681e55 /build_files/build_environment/patches/opencollada.diff | |
| parent | c116bb0c7fdae35fbb062260cc9581eb3b4f36cf (diff) | |
| parent | 33ab011ae4928cbbb49115abf653d91b8f3ba4d2 (diff) | |
Merge branch 'master' into id_copy_refactorid_copy_refactor
Conflicts:
source/blender/blenkernel/BKE_sequencer.h
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/sequencer.c
source/blender/editors/space_sequencer/sequencer_edit.c
Diffstat (limited to 'build_files/build_environment/patches/opencollada.diff')
| -rw-r--r-- | build_files/build_environment/patches/opencollada.diff | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/build_files/build_environment/patches/opencollada.diff b/build_files/build_environment/patches/opencollada.diff new file mode 100644 index 00000000000..0c91b4151fe --- /dev/null +++ b/build_files/build_environment/patches/opencollada.diff @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3fc9be5..5112ce6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -254,11 +254,11 @@ + 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.orig b/DAEValidator/library/include/no_warning_begin +index 3fc9be5..5112ce6 100644 +--- a/DAEValidator/library/include/no_warning_begin.orig 2017-05-31 16:56:39 -0600 ++++ b/DAEValidator/library/include/no_warning_begin 2017-06-07 10:18:45 -0600 +@@ -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 |