diff --git a/build_files/buildbot/config/blender_linux.cmake b/build_files/buildbot/config/blender_linux.cmake index 57e8e89decd..19e1dbac947 100644 --- a/build_files/buildbot/config/blender_linux.cmake +++ b/build_files/buildbot/config/blender_linux.cmake @@ -8,25 +8,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/../../cmake/config/blender_release.cmake") message(STATUS "Building in Rocky 8 Linux 64bit environment") -set(LIBDIR_NAME "linux_x86_64_glibc_228") - # ######## Linux-specific build options ######## # Options which are specific to Linux-only platforms set(WITH_DOC_MANPAGE OFF CACHE BOOL "" FORCE) - -# ######## Official release-specific build options ######## -# Options which are specific to Linux release builds only - -set(WITH_JACK_DYNLOAD ON CACHE BOOL "" FORCE) -set(WITH_PULSEAUDIO_DYNLOAD ON CACHE BOOL "" FORCE) -set(WITH_SDL_DYNLOAD ON CACHE BOOL "" FORCE) - -# ######## Release environment specific settings ######## - -set(LIBDIR "${CMAKE_CURRENT_LIST_DIR}/../../../../lib/${LIBDIR_NAME}" CACHE STRING "" FORCE) - -# Platform specific configuration, to ensure static linking against everything. - -# Additional linking libraries -set(CMAKE_EXE_LINKER_FLAGS "-lrt -no-pie" CACHE STRING "" FORCE) diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake index 2807af50a3c..3d78f9d9787 100644 --- a/build_files/cmake/config/blender_release.cmake +++ b/build_files/cmake/config/blender_release.cmake @@ -78,6 +78,9 @@ if(UNIX AND NOT APPLE) set(WITH_PULSEAUDIO ON CACHE BOOL "" FORCE) set(WITH_X11_XINPUT ON CACHE BOOL "" FORCE) set(WITH_X11_XF86VMODE ON CACHE BOOL "" FORCE) + set(WITH_JACK_DYNLOAD ON CACHE BOOL "" FORCE) + set(WITH_PULSEAUDIO_DYNLOAD ON CACHE BOOL "" FORCE) + set(WITH_SDL_DYNLOAD ON CACHE BOOL "" FORCE) endif() if(NOT APPLE) set(WITH_XR_OPENXR ON CACHE BOOL "" FORCE)