diff --git a/debian/rules b/debian/rules index 8a56eecdfb..b39ff04487 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,7 @@ override_dh_auto_configure: mkdir obj-$(DEB_TARGET_MULTIARCH) - (cd obj-$(DEB_TARGET_MULTIARCH) && cmake .. -DCMAKE_INSTALL_PREFIX=/opt/hifi -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON "-GUnix Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCLIENT_ONLY=ON -DDOWNLOAD_SERVERLESS_CONTENT=ON -DCMAKE_CXX_COMPILER=/usr/lib/llvm-7/bin/clang\+\+ -DOpenGL_GL_PREFERENCE=GLVND) + (cd obj-$(DEB_TARGET_MULTIARCH) && cmake .. -DCMAKE_INSTALL_PREFIX=/opt/hifi -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON "-GUnix Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCLIENT_ONLY=ON -DDOWNLOAD_SERVERLESS_CONTENT=ON -DCMAKE_CXX_COMPILER=/usr/lib/llvm-7/bin/clang\+\+ -DOpenGL_GL_PREFERENCE=LEGACY) override_dh_auto_build: (cd obj-$(DEB_TARGET_MULTIARCH) && make -j4) diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index fa148f213c..0a0ade149d 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -239,7 +239,7 @@ target_openssl() target_bullet() -set(OpenGL_GL_PREFERENCE "GLVND") +set(OpenGL_GL_PREFERENCE "LEGACY") target_opengl() add_crashpad() target_breakpad() diff --git a/libraries/display-plugins/CMakeLists.txt b/libraries/display-plugins/CMakeLists.txt index 67c06120ca..cdc6263025 100644 --- a/libraries/display-plugins/CMakeLists.txt +++ b/libraries/display-plugins/CMakeLists.txt @@ -13,7 +13,7 @@ include_hifi_library_headers(ktx) include_hifi_library_headers(render) include_hifi_library_headers(procedural) -set(OpenGL_GL_PREFERENCE "GLVND") +set(OpenGL_GL_PREFERENCE "LEGACY") target_opengl() GroupSources("src/display-plugins") diff --git a/libraries/gl/CMakeLists.txt b/libraries/gl/CMakeLists.txt index f0eec1da9f..4e3d7ca16c 100644 --- a/libraries/gl/CMakeLists.txt +++ b/libraries/gl/CMakeLists.txt @@ -2,6 +2,6 @@ set(TARGET_NAME gl) setup_hifi_library(Gui Widgets) link_hifi_libraries(shared) -set(OpenGL_GL_PREFERENCE "GLVND") +set(OpenGL_GL_PREFERENCE "LEGACY") target_opengl() diff --git a/libraries/gpu-gl-common/CMakeLists.txt b/libraries/gpu-gl-common/CMakeLists.txt index 6bd98a45d0..eec135e8fe 100644 --- a/libraries/gpu-gl-common/CMakeLists.txt +++ b/libraries/gpu-gl-common/CMakeLists.txt @@ -3,6 +3,6 @@ setup_hifi_library(Concurrent) link_hifi_libraries(shared gl gpu shaders) GroupSources("src") -set(OpenGL_GL_PREFERENCE "GLVND") +set(OpenGL_GL_PREFERENCE "LEGACY") target_opengl() diff --git a/libraries/gpu-gl/CMakeLists.txt b/libraries/gpu-gl/CMakeLists.txt index a57d0b66d8..01f097df87 100644 --- a/libraries/gpu-gl/CMakeLists.txt +++ b/libraries/gpu-gl/CMakeLists.txt @@ -6,6 +6,6 @@ if (UNIX) endif(UNIX) GroupSources("src") -set(OpenGL_GL_PREFERENCE "GLVND") +set(OpenGL_GL_PREFERENCE "LEGACY") target_opengl() diff --git a/libraries/qml/CMakeLists.txt b/libraries/qml/CMakeLists.txt index b59b65824d..3d53191720 100644 --- a/libraries/qml/CMakeLists.txt +++ b/libraries/qml/CMakeLists.txt @@ -3,5 +3,5 @@ setup_hifi_library(Multimedia Network Qml Quick WebChannel WebSockets ${PLATFORM link_hifi_libraries(shared networking gl) # Required for some low level GL interaction in the OffscreenQMLSurface -set(OpenGL_GL_PREFERENCE "GLVND") +set(OpenGL_GL_PREFERENCE "LEGACY") target_opengl() diff --git a/libraries/ui/CMakeLists.txt b/libraries/ui/CMakeLists.txt index 6dde4cc1a2..3625bd4f3e 100644 --- a/libraries/ui/CMakeLists.txt +++ b/libraries/ui/CMakeLists.txt @@ -4,5 +4,5 @@ link_hifi_libraries(shared networking qml gl audio audio-client plugins pointers include_hifi_library_headers(controllers) # Required for some low level GL interaction in the OffscreenQMLSurface -set(OpenGL_GL_PREFERENCE "GLVND") +set(OpenGL_GL_PREFERENCE "LEGACY") target_opengl() diff --git a/tools/gpu-frame-player/CMakeLists.txt b/tools/gpu-frame-player/CMakeLists.txt index 6ea896edf2..cb20cdde25 100644 --- a/tools/gpu-frame-player/CMakeLists.txt +++ b/tools/gpu-frame-player/CMakeLists.txt @@ -22,7 +22,7 @@ link_hifi_libraries( target_compile_definitions(${TARGET_NAME} PRIVATE USE_GL) -set(OpenGL_GL_PREFERENCE "GLVND") +set(OpenGL_GL_PREFERENCE "LEGACY") target_opengl() #target_vulkan()