diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2020-04-05 21:56:06 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-04-05 22:04:10 +0300 |
| commit | bae1c243cec809ac783c1b8f2fb65a570b526ef0 (patch) | |
| tree | c5cf685943b70f7986ebc3d0424b220586751ad2 | |
| parent | f1573731bc8b80c03ef5db4292568781969846c3 (diff) | |
Build: hide USD symbols, make Blender symbols visible again
Following up to b555b8d.
Building Blender with hidden symbols but using libraries with visible symbols
was giving linker warnings, specifically for USD. So revert that for now, as
it was not needed for the bugfix.
Hide USD symbols (some of which are not in the USD namespace) to avoid potential
conflicts. May potentially help with AMD OpenCL issues in T74262.
| -rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 1 | ||||
| -rw-r--r-- | build_files/cmake/platform/platform_unix.cmake | 1 | ||||
| -rw-r--r-- | source/creator/blender.map | 3 | ||||
| -rw-r--r-- | source/creator/osx_locals.map | 3 |
4 files changed, 6 insertions, 2 deletions
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index f5f8c209d9d..d8ee82d4c10 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -453,7 +453,6 @@ endif() set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Xlinker -unexported_symbols_list -Xlinker '${CMAKE_SOURCE_DIR}/source/creator/osx_locals.map'" ) -set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -fvisibility=hidden") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -stdlib=libc++") diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index 0bf790b34e6..cd304d65eac 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -603,7 +603,6 @@ endif() # Avoid conflicts with Mesa llvmpipe, Luxrender, and other plug-ins that may # use the same libraries as Blender with a different version or build options. -set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -fvisibility=hidden") set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Wl,--version-script='${CMAKE_SOURCE_DIR}/source/creator/blender.map'" ) diff --git a/source/creator/blender.map b/source/creator/blender.map index 3e447ec9e89..fda6c37b10d 100644 --- a/source/creator/blender.map +++ b/source/creator/blender.map @@ -58,12 +58,15 @@ local: opj_*; opus_*; *OSL*; + *pathYy*; png_*; *SDL*; *squish*; *tbb*; + *textFileFormatYy*; *TIFF*; *tinyformat*; + *usdBlender*; vorbis*; vp8*; vp9*; diff --git a/source/creator/osx_locals.map b/source/creator/osx_locals.map index 908bfdae6cb..50e7e9838d4 100644 --- a/source/creator/osx_locals.map +++ b/source/creator/osx_locals.map @@ -49,12 +49,15 @@ ogg* opj_* opus_* *OSL* +*pathYy* png_* *SDL* *squish* *tbb* +*textFileFormatYy* *TIFF* *tinyformat* +*usdBlender* vorbis* vp8* vp9* |