summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--avmedia/Library_avmedia.mk2
-rw-r--r--avmedia/Library_avmediaogl.mk2
-rw-r--r--canvas/Library_oglcanvas.mk2
-rw-r--r--chart2/Library_chartcore.mk2
-rw-r--r--chart2/Library_chartopengl.mk2
-rw-r--r--configure.ac36
-rw-r--r--desktop/Library_sofficeapp.mk1
-rw-r--r--external/libgltf/ExternalProject_libgltf.mk2
-rw-r--r--slideshow/Library_OGLTrans.mk2
-rw-r--r--slideshow/Library_slideshow.mk2
-rw-r--r--svx/Executable_gengal.mk1
-rw-r--r--svx/Library_svxcore.mk2
-rw-r--r--vcl/CppunitTest_vcl_bitmap_test.mk2
-rw-r--r--vcl/Executable_icontest.mk3
-rw-r--r--vcl/Executable_mtfdemo.mk1
-rw-r--r--vcl/Executable_ui-previewer.mk1
-rw-r--r--vcl/Executable_vcldemo.mk3
-rw-r--r--vcl/StaticLibrary_glxtest.mk1
18 files changed, 31 insertions, 36 deletions
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index ec70670487ce..f922486750cb 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -26,7 +26,7 @@ $(eval $(call gb_Library_add_defs,avmedia,\
$(eval $(call gb_Library_use_externals,avmedia,\
boost_headers \
glew \
- mesa_headers \
+ $(if $(filter WNT MACOSX,$(OS)),mesa_headers) \
))
$(eval $(call gb_Library_use_libraries,avmedia,\
diff --git a/avmedia/Library_avmediaogl.mk b/avmedia/Library_avmediaogl.mk
index 3ff981811846..117e8965c2e5 100644
--- a/avmedia/Library_avmediaogl.mk
+++ b/avmedia/Library_avmediaogl.mk
@@ -18,7 +18,7 @@ $(eval $(call gb_Library_use_externals,avmediaogl, \
libgltf \
glew \
glm_headers \
- mesa_headers \
+ $(if $(filter WNT MACOSX,$(OS)),mesa_headers) \
))
$(eval $(call gb_Library_use_libraries,avmediaogl,\
diff --git a/canvas/Library_oglcanvas.mk b/canvas/Library_oglcanvas.mk
index 7f859f696e5d..839567dd5a6a 100644
--- a/canvas/Library_oglcanvas.mk
+++ b/canvas/Library_oglcanvas.mk
@@ -43,7 +43,7 @@ $(eval $(call gb_Library_add_exception_objects,oglcanvas,\
$(eval $(call gb_Library_use_externals,oglcanvas,\
boost_headers \
glew \
- mesa_headers \
+ $(if $(filter WNT MACOSX,$(OS)),mesa_headers) \
))
ifeq ($(strip $(OS)),MACOSX)
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index c65f2628ef96..f611c68323b3 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Library_use_externals,chartcore,\
boost_headers \
glm_headers \
glew \
- mesa_headers \
+ $(if $(filter WNT MACOSX,$(OS)),mesa_headers) \
))
$(eval $(call gb_Library_use_custom_headers,chartcore,\
diff --git a/chart2/Library_chartopengl.mk b/chart2/Library_chartopengl.mk
index 83d52d8bfa8d..440ef9ed614f 100644
--- a/chart2/Library_chartopengl.mk
+++ b/chart2/Library_chartopengl.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_Library_set_precompiled_header,chartopengl,$(SRCDIR)/chart2/inc
$(eval $(call gb_Library_use_externals,chartopengl,\
boost_headers \
glm_headers \
- mesa_headers \
+ $(if $(filter WNT MACOSX,$(OS)),mesa_headers) \
glew \
))
diff --git a/configure.ac b/configure.ac
index 6bdf28d54459..31cc1d9bcb9e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10410,23 +10410,25 @@ else
fi
ENABLE_OPENGL_CANVAS=TRUE
- dnl ===================================================================
- dnl Check for system Mesa
- dnl ===================================================================
- AC_MSG_CHECKING([which Mesa headers to use])
- if test "$with_system_mesa_headers" = "yes"; then
- AC_MSG_RESULT([external])
- SYSTEM_MESA_HEADERS=TRUE
- AC_LANG_PUSH(C)
- AC_CHECK_HEADER(GL/glxext.h, [],
- [ AC_MSG_ERROR(mesa headers not found.)], [#include <GL/glx.h>])
- AC_MSG_CHECKING([whether GL/glxext.h defines PFNGLXBINDTEXIMAGEEXTPROC])
- AC_EGREP_HEADER(PFNGLXBINDTEXIMAGEEXTPROC, GL/glxext.h, [AC_MSG_RESULT([yes])], AC_MSG_ERROR(no))
- AC_LANG_POP(C)
- else
- AC_MSG_RESULT([internal])
- SYSTEM_MESA_HEADERS=
- BUILD_TYPE="$BUILD_TYPE MESA"
+ if test "$USING_X11" != TRUE; then
+ dnl ===================================================================
+ dnl Check for system Mesa
+ dnl ===================================================================
+ AC_MSG_CHECKING([which Mesa headers to use])
+ if test "$with_system_mesa_headers" = "yes"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_MESA_HEADERS=TRUE
+ AC_LANG_PUSH(C)
+ AC_CHECK_HEADER(GL/glxext.h, [],
+ [ AC_MSG_ERROR(mesa headers not found.)], [#include <GL/glx.h>])
+ AC_MSG_CHECKING([whether GL/glxext.h defines PFNGLXBINDTEXIMAGEEXTPROC])
+ AC_EGREP_HEADER(PFNGLXBINDTEXIMAGEEXTPROC, GL/glxext.h, [AC_MSG_RESULT([yes])], AC_MSG_ERROR(no))
+ AC_LANG_POP(C)
+ else
+ AC_MSG_RESULT([internal])
+ SYSTEM_MESA_HEADERS=
+ BUILD_TYPE="$BUILD_TYPE MESA"
+ fi
fi
fi
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index 274bb1af84f1..ef95ecfbdc19 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -112,7 +112,6 @@ $(eval $(call gb_Library_use_static_libraries,sofficeapp,\
$(eval $(call gb_Library_add_libs,sofficeapp,\
-lm $(DLOPEN_LIBS) \
-lpthread \
- -lGL \
-lX11 \
))
endif
diff --git a/external/libgltf/ExternalProject_libgltf.mk b/external/libgltf/ExternalProject_libgltf.mk
index 23aa29c56dc2..fcc82afa4b21 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -67,7 +67,7 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
--disable-werror \
BOOST_CFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
- GLEW_CFLAGS="$(if $(SYSTEM_GLEW),$(GLEW_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,glew)/include)" \
+ GLEW_CFLAGS="$(if $(SYSTEM_GLEW),$(GLEW_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,glew)/include) -DGLEW_NO_GLU" \
GLM_CFLAGS="$(if $(SYSTEM_GLM),$(GLM_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,glm))" \
$(if $(libgltf_CPPFLAGS),CPPFLAGS='$(libgltf_CPPFLAGS)') \
&& $(MAKE) \
diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk
index 4c3340f34e7d..04b44e05019c 100644
--- a/slideshow/Library_OGLTrans.mk
+++ b/slideshow/Library_OGLTrans.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_Library_use_libraries,OGLTrans,\
$(eval $(call gb_Library_use_externals,OGLTrans,\
boost_headers \
glew \
- mesa_headers \
+ $(if $(filter WNT MACOSX,$(OS)),mesa_headers) \
glm_headers \
))
diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
index 5772afd1d37d..7d0e8150ed4d 100644
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Library_set_precompiled_header,slideshow,$(SRCDIR)/slideshow/in
$(eval $(call gb_Library_use_externals,slideshow,\
boost_headers \
glew \
- mesa_headers \
+ $(if $(filter WNT MACOSX,$(OS)),mesa_headers) \
))
$(eval $(call gb_Library_use_sdk_api,slideshow))
diff --git a/svx/Executable_gengal.mk b/svx/Executable_gengal.mk
index e075b0522d2a..e0a45e72b508 100644
--- a/svx/Executable_gengal.mk
+++ b/svx/Executable_gengal.mk
@@ -71,7 +71,6 @@ ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
$(eval $(call gb_Executable_add_libs,gengal,\
$(DLOPEN_LIBS) \
-lpthread \
- -lGL \
-lX11 \
))
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index ca9e5c5d0d0d..76d4fcb6fe3b 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -84,7 +84,7 @@ $(eval $(call gb_Library_use_externals,svxcore,\
boost_headers \
icuuc \
icu_headers \
- mesa_headers \
+ $(if $(filter WNT MACOSX,$(OS)),mesa_headers) \
glew \
libxml2 \
))
diff --git a/vcl/CppunitTest_vcl_bitmap_test.mk b/vcl/CppunitTest_vcl_bitmap_test.mk
index 33a0772695be..8e94d8b17b0e 100644
--- a/vcl/CppunitTest_vcl_bitmap_test.mk
+++ b/vcl/CppunitTest_vcl_bitmap_test.mk
@@ -18,7 +18,7 @@ $(eval $(call gb_CppunitTest_use_externals,vcl_bitmap_test,\
boost_headers \
glew \
glm_headers \
- mesa_headers \
+ $(if $(filter WNT MACOSX,$(OS)),mesa_headers) \
))
$(eval $(call gb_CppunitTest_set_include,vcl_bitmap_test,\
diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk
index e9a30f8a2076..aa15dfe998f0 100644
--- a/vcl/Executable_icontest.mk
+++ b/vcl/Executable_icontest.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_Executable_use_externals,icontest,\
boost_headers \
glew \
glm_headers \
- mesa_headers \
+ $(if $(filter WNT MACOSX,$(OS)),mesa_headers) \
))
$(eval $(call gb_Executable_use_api,icontest,\
@@ -29,7 +29,6 @@ ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
$(eval $(call gb_Executable_add_libs,icontest,\
-lm $(DLOPEN_LIBS) \
-lpthread \
- -lGL \
-lX11 \
))
diff --git a/vcl/Executable_mtfdemo.mk b/vcl/Executable_mtfdemo.mk
index 01156f82296a..d637439a17ba 100644
--- a/vcl/Executable_mtfdemo.mk
+++ b/vcl/Executable_mtfdemo.mk
@@ -44,7 +44,6 @@ ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
$(eval $(call gb_Executable_add_libs,mtfdemo,\
-lm $(DLOPEN_LIBS) \
-lpthread \
- -lGL \
-lX11 \
))
diff --git a/vcl/Executable_ui-previewer.mk b/vcl/Executable_ui-previewer.mk
index 4ef1b05c9fcb..0925e575ee67 100644
--- a/vcl/Executable_ui-previewer.mk
+++ b/vcl/Executable_ui-previewer.mk
@@ -38,7 +38,6 @@ ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
$(eval $(call gb_Executable_add_libs,ui-previewer,\
-lm $(DLOPEN_LIBS) \
-lpthread \
- -lGL \
-lX11 \
))
diff --git a/vcl/Executable_vcldemo.mk b/vcl/Executable_vcldemo.mk
index 3e05cf42200e..6c9c70c08657 100644
--- a/vcl/Executable_vcldemo.mk
+++ b/vcl/Executable_vcldemo.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_Executable_use_externals,vcldemo,\
boost_headers \
glew \
glm_headers \
- mesa_headers \
+ $(if $(filter WNT MACOSX,$(OS)),mesa_headers) \
))
$(eval $(call gb_Executable_set_include,vcldemo,\
@@ -50,7 +50,6 @@ ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
$(eval $(call gb_Executable_add_libs,vcldemo,\
-lm $(DLOPEN_LIBS) \
-lpthread \
- -lGL \
-lX11 \
))
diff --git a/vcl/StaticLibrary_glxtest.mk b/vcl/StaticLibrary_glxtest.mk
index 2ac2283897c4..6e90b2454f75 100644
--- a/vcl/StaticLibrary_glxtest.mk
+++ b/vcl/StaticLibrary_glxtest.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_StaticLibrary_add_libs,glxtest,\
-lm \
-ldl \
-lpthread \
- -lGL \
-lX11 \
))
generated by cgit (git 2.34.1) at 2025-02-25 03:40:35 +0000