Merge branch 'master' into blender2.8
[blender.git] / build_files / buildbot / config / blender_linux.cmake
index 473b1dd0d68bfae5459b493c0bf6899c407b761e..0500bfa7f997a7c44a1478887b1564968f226fbe 100644 (file)
@@ -29,9 +29,8 @@ else()
        message(FATAL_ERROR "Unknown build environment")
 endif()
 
-# Default to only build Blender, not the player
+# Default to only build Blender
 set(WITH_BLENDER             ON  CACHE BOOL "" FORCE)
-set(WITH_PLAYER              OFF CACHE BOOL "" FORCE)
 
 # ######## Linux-specific build options ########
 # Options which are specific to Linux-only platforms
@@ -85,7 +84,7 @@ set(SNDFILE_LIBRARY          "/usr/lib${MULTILIB}/libsndfile.a;/usr/lib${MULTILI
 
 # OpenAL libraries
 set(OPENAL_ROOT_DIR           "/opt/lib/openal" CACHE STRING "" FORCE)
-set(OPENAL_INCLUDE_DIR        "${OPENAL_ROOT_DIR}/include" CACHE STRING "" FORCE)
+set(OPENAL_INCLUDE_DIR        "${OPENAL_ROOT_DIR}/include/AL" CACHE STRING "" FORCE)
 set(OPENAL_LIBRARY
        ${OPENAL_ROOT_DIR}/lib/libopenal.a
        ${OPENAL_ROOT_DIR}/lib/libcommon.a