isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-30 03:50:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

build: Fix platform detection for Quartz/OSX

Browse Source 
The location of the header files for GL and the linker flags are
different on Mac OS X than other Unices.
This commit is contained in:
Emmanuele Bassi 2011-05-24 22:29:42 +01:00
parent 97abcda1a2
commit df688ad0c8
1 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
configure.ac
View File

@ -148,6 +148,8 @@ AS_CASE([$host],
AC_MSG_RESULT([$platform_win32]) AC_MSG_RESULT([$platform_win32])
AM_CONDITIONAL(OS_WIN32, [test "$platform_win32" = "yes"]) AM_CONDITIONAL(OS_WIN32, [test "$platform_win32" = "yes"])
AC_CHECK_HEADER([OpenGL/gl.h], [platform_quartz=yes], [platform_quartz=no])
AM_CONDITIONAL(OS_QUARTZ, [test "$platform_quartz" = "yes"])
dnl ================================================================ dnl ================================================================
dnl Handle extra configure options dnl Handle extra configure options
@ -444,15 +446,22 @@ AS_IF([test "x$enable_gl" = "xyes"],
cogl_gl_headers="GL/gl.h" cogl_gl_headers="GL/gl.h"
AS_IF([test "x$platform_win32" = "xyes"], AS_IF([test "x$platform_quartz" = "xyes"],
[
cogl_gl_headers="OpenGL/gl.h"
COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -framework OpenGL"
],
[test "x$platform_win32" = "xyes"],
[ [
COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -lopengl32 -lgdi32 -lwinmm" COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -lopengl32 -lgdi32 -lwinmm"
COGL_EXTRA_CFLAGS="$COGL_EXTRA_CFLAGS -D_WIN32_WINNT=0x0500" COGL_EXTRA_CFLAGS="$COGL_EXTRA_CFLAGS -D_WIN32_WINNT=0x0500"
ALLOW_WGL=yes ALLOW_WGL=yes
], ],
[ [
PKG_CHECK_EXISTS( PKG_CHECK_EXISTS([gl],
[gl], [COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES gl"], [COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES gl"],
[AC_CHECK_LIB(GL, [glGetString], [AC_CHECK_LIB(GL, [glGetString],
[COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -lGL"], [COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -lGL"],
[AC_MSG_ERROR([Unable to locate required GL library])]) [AC_MSG_ERROR([Unable to locate required GL library])])
@ -552,6 +561,29 @@ AS_IF([test "x$enable_wgl" = "xyes"],
]) ])
AM_CONDITIONAL(SUPPORT_WGL, [test "x$SUPPORT_WGL" = "xyes"]) AM_CONDITIONAL(SUPPORT_WGL, [test "x$SUPPORT_WGL" = "xyes"])
AC_ARG_ENABLE(
[quartz],
[AC_HELP_STRING([--enable-quartz=@<:@no/yes@:>@], [Enable support for the Quartz platform @<:@default=no@:>@])],
[],
[AS_IF([test "x$platform_quartz" = "xyes"], [enable_quartz=yes], [enable_quartz=no])]
)
AS_IF([test "x$enable_quartz" = "xyes"],
[AS_IF([test "x$platform_quartz" = "xno"],
[AC_MSG_ERROR([OpenGL framework not support with $COGL_DRIVER driver])])
AS_IF([test "x$enable_stub_winsys" = "xyes"],
[AC_MSG_ERROR([Stub winsys not currently compatible with others])])
SUPPORT_QUARTZ=yes
GL_WINSYS_APIS="$GL_WINSYS_APIS quartz"
AC_DEFINE([COGL_HAS_QUARTZ_SUPPORT], [1], [Cogl supports OpenGL using the Quartz framework])
COGL_DEFINES_SYMBOLS-"$COGL_DEFINES_SYMBOLS COGL_HAS_QUARTZ_SUPPORT"
#AC_DEFINE([COGL_HAS_FULL_WINSYS], [1], [Cogl can create its own OpenGL context])
])
AM_CONDITIONAL(SUPPORT_QUARTZ, [test "x$SUPPORT_QUARTZ" = "xyes"])
EGL_PLATFORM_COUNT=0 EGL_PLATFORM_COUNT=0
AC_ARG_ENABLE( AC_ARG_ENABLE(