mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make it possible to even try building the OpenGL transitions for Windows

Browse Source 
Change-Id: Id9b688a22518aedb8959120f909832f0cd84b324
This commit is contained in:
Tor Lillqvist
2013-01-10 15:09:46 +02:00
parent b0a827aa83
commit dc7e074fc8
1 changed files with 47 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
configure.ac
View File

@@ -867,8 +867,7 @@ AC_ARG_ENABLE(cairo-canvas,
AC_ARG_ENABLE(opengl, AC_ARG_ENABLE(opengl,
AS_HELP_STRING([--disable-opengl], AS_HELP_STRING([--disable-opengl],
[Determines whether to build the OpenGL 3D slide transitions component.]), [Determines whether to build the OpenGL 3D slide transitions component.]))
,enable_opengl=yes)
AC_ARG_ENABLE(dbus, AC_ARG_ENABLE(dbus,
AS_HELP_STRING([--disable-dbus], AS_HELP_STRING([--disable-dbus],
@@ -9702,47 +9701,59 @@ dnl ===================================================================
AC_MSG_CHECKING([whether to build the OpenGL Transitions component]) AC_MSG_CHECKING([whether to build the OpenGL Transitions component])
ENABLE_OPENGL= ENABLE_OPENGL=
if test "$_os" = "Darwin"; then if test -z "$enable_opengl"; then
if test $_os = WINNT; then
# By default disable the OpenGL transitions for Windows (the code doesn't even compile
# currently). In other words, use --enable-opengl only if you plan to hack on that code for
# Windows.
enable_opengl=no
else
enable_opengl=yes
fi
fi
if test "x$enable_opengl" = "xno"; then
AC_MSG_RESULT([no])
elif test "$_os" = "Darwin"; then
# We use frameworks on Mac OS X, no need for detail checks # We use frameworks on Mac OS X, no need for detail checks
ENABLE_OPENGL=TRUE ENABLE_OPENGL=TRUE
SYSTEM_MESA_HEADERS=YES SYSTEM_MESA_HEADERS=YES
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
elif test $_os = WINNT; then
# Experimental: try to use OpenGL on Windows
ENABLE_OPENGL=TRUE
# We need the internal "Mesa" headers.
SYSTEM_MESA_HEADERS=NO
BUILD_TYPE="$BUILD_TYPE MESA"
AC_MSG_RESULT([yes])
else else
if test "x$enable_opengl" != "xno"; then save_LDFLAGS=$LDFLAGS
if test "$_os" != "WINNT"; then LDFLAGS="$LDFLAGS -lm"
save_LDFLAGS=$LDFLAGS AC_MSG_RESULT([yes])
LDFLAGS="$LDFLAGS -lm" AC_CHECK_LIB([GL], [main], [:],
AC_MSG_RESULT([yes]) [AC_MSG_ERROR(libGL not installed or functional)], [])
AC_CHECK_LIB([GL], [main], [:], AC_CHECK_LIB([GLU], [main], [:],
[AC_MSG_ERROR(libGL not installed or functional)], []) [AC_MSG_ERROR(libGLU not installed or functional)], [])
AC_CHECK_LIB([GLU], [main], [:], ENABLE_OPENGL=TRUE
[AC_MSG_ERROR(libGLU not installed or functional)], []) LDFLAGS=$save_LDFLAGS
ENABLE_OPENGL=TRUE
LDFLAGS=$save_LDFLAGS
dnl =================================================================== dnl ===================================================================
dnl Check for system Mesa dnl Check for system Mesa
dnl =================================================================== dnl ===================================================================
AC_MSG_CHECKING([which Mesa headers to use]) AC_MSG_CHECKING([which Mesa headers to use])
if test "$with_system_mesa_headers" = "yes"; then if test "$with_system_mesa_headers" = "yes"; then
AC_MSG_RESULT([external]) AC_MSG_RESULT([external])
SYSTEM_MESA_HEADERS=YES SYSTEM_MESA_HEADERS=YES
AC_LANG_PUSH(C) AC_LANG_PUSH(C)
AC_CHECK_HEADER(GL/glxext.h, [], AC_CHECK_HEADER(GL/glxext.h, [],
[ AC_MSG_ERROR(mesa headers not found.)], [#include <GL/glx.h>]) [ AC_MSG_ERROR(mesa headers not found.)], [#include <GL/glx.h>])
AC_MSG_CHECKING([whether GL/glxext.h defines PFNGLXBINDTEXIMAGEEXTPROC]) 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_EGREP_HEADER(PFNGLXBINDTEXIMAGEEXTPROC, GL/glxext.h, [AC_MSG_RESULT([yes])], AC_MSG_ERROR(no))
AC_LANG_POP(C) AC_LANG_POP(C)
else
AC_MSG_RESULT([internal])
SYSTEM_MESA_HEADERS=NO
BUILD_TYPE="$BUILD_TYPE MESA"
fi
else
AC_MSG_RESULT([not on Windows])
fi
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([internal])
SYSTEM_MESA_HEADERS=NO
BUILD_TYPE="$BUILD_TYPE MESA"
fi fi
fi fi