Skip to content

Commit 1da62ac

Browse files
committed
Update patch
1 parent 7fc16a1 commit 1da62ac

File tree

1 file changed

+17
-10
lines changed

1 file changed

+17
-10
lines changed

bcompat7.patch

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index 408cf819ce8..0104afdea6e 100644
2+
index 212aa7dffd4..2453efe8950 100644
33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
5-
@@ -4,6 +4,10 @@
5+
@@ -5,6 +5,10 @@
66
# -----------------------------------------------------------------------------
77
# Early Initialization
88

@@ -14,7 +14,7 @@ index 408cf819ce8..0104afdea6e 100644
1414
# all out-of-source builds will use the CMakeCache.txt file there and even
1515
# build the libs and objects in it.
1616
diff --git a/build_files/windows/check_libraries.cmd b/build_files/windows/check_libraries.cmd
17-
index e8c04fb3258..6c0283e838e 100644
17+
index e8c04fb3258..4f4b605cc5d 100644
1818
--- a/build_files/windows/check_libraries.cmd
1919
+++ b/build_files/windows/check_libraries.cmd
2020
@@ -35,6 +35,24 @@ if NOT EXIST %BUILD_VS_LIBDIR% (
@@ -51,11 +51,18 @@ index e8c04fb3258..6c0283e838e 100644
5151
)
5252

5353
if NOT EXIST %BUILD_VS_LIBDIR% (
54+
@@ -57,4 +77,4 @@ if NOT EXIST %BUILD_VS_LIBDIR% (
55+
echo This is most likely caused by svn.exe not being available.
56+
)
57+
exit /b 1
58+
-)
59+
\ No newline at end of file
60+
+)
5461
diff --git a/source/blender/gpu/opengl/gl_backend.cc b/source/blender/gpu/opengl/gl_backend.cc
55-
index ffbba7dcd8c..0d49863b11a 100644
62+
index f02f3386a4d..43425759989 100644
5663
--- a/source/blender/gpu/opengl/gl_backend.cc
5764
+++ b/source/blender/gpu/opengl/gl_backend.cc
58-
@@ -302,8 +302,23 @@ static void detect_workarounds()
65+
@@ -387,8 +387,23 @@ static void detect_workarounds()
5966
* polaris platform. Keeping legacy platforms around just in case.
6067
*/
6168
if (GPU_type_matches(GPU_DEVICE_ATI, GPU_OS_ANY, GPU_DRIVER_OFFICIAL)) {
@@ -82,10 +89,10 @@ index ffbba7dcd8c..0d49863b11a 100644
8289
if (match_renderer(renderer, matches)) {
8390
GCaps.use_hq_normals_workaround = true;
8491
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
85-
index caaffa283ba..de4459ee95f 100644
92+
index 66943111380..8c5d6faefd1 100644
8693
--- a/source/creator/CMakeLists.txt
8794
+++ b/source/creator/CMakeLists.txt
88-
@@ -34,6 +34,9 @@ if(WITH_TBB)
95+
@@ -40,6 +40,9 @@ if(WITH_TBB)
8996
list(INSERT LIB 0 bf_blenkernel)
9097
endif()
9198

@@ -95,9 +102,9 @@ index caaffa283ba..de4459ee95f 100644
95102
if(WIN32)
96103
list(APPEND INC ../../intern/utfconv)
97104
endif()
98-
@@ -1285,6 +1287,12 @@ elseif(WIN32)
99-
DESTINATION ${TARGETDIR_EXE}
100-
)
105+
@@ -1400,6 +1403,12 @@ elseif(WIN32)
106+
if(PLATFORM_BUNDLED_LIBRARIES)
107+
windows_process_platform_bundled_libraries("${PLATFORM_BUNDLED_LIBRARIES}")
101108
endif()
102109
+
103110
+ install(

0 commit comments

Comments
 (0)