4 files changed, 16 insertions, 4 deletions
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index b8809f7b0967..f09182257d0d 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -25,9 +25,15 @@ $(eval $(call gb_Library_add_defs,avmedia,\
 
 $(eval $(call gb_Library_use_externals,avmedia,\
 	boost_headers \
-	glew \
 ))
 
+ifeq ($(ENABLE_OPENGL),TRUE)
+$(eval $(call gb_Library_use_externals,avmedia,\
+    glew \
+))
+endif
+
+
 $(eval $(call gb_Library_use_libraries,avmedia,\
 	comphelper \
 	ucbhelper \
@@ -45,10 +51,12 @@ $(eval $(call gb_Library_use_libraries,avmedia,\
 ))
 
 ifeq ($(ENABLE_GLTF),TRUE)
+ifeq ($(ENABLE_OPENGL),TRUE)
 $(eval $(call gb_Library_add_exception_objects,avmedia,\
 	avmedia/source/framework/modeltools \
 ))
 endif
+endif
 
 ifeq ($(ENABLE_COLLADA),TRUE)
 
diff --git a/avmedia/Library_avmediaogl.mk b/avmedia/Library_avmediaogl.mk
index b7498bfb1a15..24133b866999 100644
--- a/avmedia/Library_avmediaogl.mk
+++ b/avmedia/Library_avmediaogl.mk
@@ -7,6 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
+ifeq ($(ENABLE_OPENGL),TRUE)
 $(eval $(call gb_Library_Library,avmediaogl))
 
 $(eval $(call gb_Library_set_componentfile,avmediaogl,avmedia/source/opengl/avmediaogl))
@@ -56,5 +57,5 @@ $(eval $(call gb_Library_add_libs,avmediaogl,\
     -lGL \
 ))
 endif
-
+endif
 # vim: set noet sw=4 ts=4:
diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
index 06af36f7915a..ff5ba90bda98 100644
--- a/avmedia/Module_avmedia.mk
+++ b/avmedia/Module_avmedia.mk
@@ -55,7 +55,7 @@ $(eval $(call gb_Module_add_targets,avmedia,\
 ))
 endif
 
-ifeq ($(ENABLE_GLTF),TRUE)
+ifeq ($(ENABLE_OPENGL),TRUE)
 $(eval $(call gb_Module_add_targets,avmedia,\
 	Library_avmediaogl \
 ))
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 6206abb73300..ecd282df5ccf 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -39,8 +39,9 @@
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/media/XManager.hpp>
 #include <vcl/sysdata.hxx>
+#if HAVE_FEATURE_OPENGL
 #include <vcl/opengl/OpenGLContext.hxx>
-
+#endif
 using namespace ::com::sun::star;
 
 namespace avmedia { namespace priv {
@@ -223,11 +224,13 @@ uno::Reference<media::XPlayer> MediaWindowImpl::createPlayer(const OUString& rUR
         }
     }
 #if HAVE_FEATURE_GLTF
+#if HAVE_FEATURE_OPENGL
     else if ( *pMimeType == AVMEDIA_MIMETYPE_JSON )
     {
         xPlayer = createPlayer(rURL, AVMEDIA_OPENGL_MANAGER_SERVICE_NAME, xContext);
     }
 #endif
+#endif
 
     return xPlayer;
 }