Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build_files/cmake/platform/platform_unix.cmake4
m---------release/datafiles/locale0
m---------release/scripts/addons0
m---------release/scripts/addons_contrib0
4 files changed, 4 insertions, 0 deletions
diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake
index 2bfc4cda20c..0d486c84fe6 100644
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@ -39,6 +39,10 @@ if(EXISTS ${LIBDIR})
set(WITH_OPENMP_STATIC ON)
endif()
+if(WITH_STATIC_LIBS)
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libstdc++")
+endif()
+
# Wrapper to prefer static libraries
macro(find_package_wrapper)
if(WITH_STATIC_LIBS)
diff --git a/release/datafiles/locale b/release/datafiles/locale
-Subproject 29c2218102135522d6e2cd4bba7ab47d7241ab8
+Subproject f81ed052157aff3979763cf25840032d11d261b
diff --git a/release/scripts/addons b/release/scripts/addons
-Subproject c94604993b3e0bfbc733861e890aff18513e02b
+Subproject 26330ab14347cef00d67e2e4335c9609082e227
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
-Subproject 3a80a18ea081ff93f4b3672120b446b7adc93e8
+Subproject 57596569d9bc50230a0430e7ed159c963c00814