diff options
| author | Paolo Bonzini <bonzini@gnu.org> | 2008-11-28 23:27:26 +0100 |
|---|---|---|
| committer | Nicolas Bruguier <nicolas.bruguier@supersonicimagine.fr> | 2008-11-29 14:08:50 +0100 |
| commit | 8b06b5884ebe0992376ea6e1319822002b681213 (patch) | |
| tree | 23cd9fc8639c34fa4063cea966c825f200411f3f | |
| parent | 190cece94e3e97cd85e61e994214cb01ea2d610f (diff) | |
[agl] fix agl builds
Fix agl build.
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | examples/glitzinfo/Makefile.am | 2 | ||||
| -rw-r--r-- | examples/glitzinfo/glitzinfo.c | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/configure.in b/configure.in index e2394cc..d5765d1 100644 --- a/configure.in +++ b/configure.in @@ -222,7 +222,7 @@ AH_TEMPLATE([PTHREADS], [Define if PTHREADS are supported]) if test "x$use_agl" = "xyes"; then AC_MSG_CHECKING([for AGL.framework]) save_libs="$LIBS" - LIBS="-framework AGL" + LIBS="$LIBS -framework AGL" AC_TRY_LINK_FUNC(aglCreateContext, [use_agl=yes], [use_agl=no]) LIBS="$save_libs" AC_MSG_RESULT([$use_agl]) @@ -236,6 +236,8 @@ if test "x$use_agl" = "xyes"; then LIBS="$save_LIBS" + AGL_LIBS="-framework AGL -framework OpenGL -framework Carbon" + CARBON_LIBS= if test "x$use_pthreads" = "xyes" then AGL_LIBS="$AGL_LIBS -lpthread" @@ -253,6 +255,8 @@ else AM_CONDITIONAL(GLITZ_BUILD_AGL_BACKEND, false) fi +AC_SUBST(CARBON_CFLAGS) +AC_SUBST(CARBON_LIBS) AC_SUBST(AGL_CFLAGS) AC_SUBST(AGL_LIBS) AC_SUBST(GLITZ_AGL_CFLAGS) diff --git a/examples/glitzinfo/Makefile.am b/examples/glitzinfo/Makefile.am index 1bceebe..22b74f7 100644 --- a/examples/glitzinfo/Makefile.am +++ b/examples/glitzinfo/Makefile.am @@ -9,7 +9,7 @@ glitzinfo_agl_CFLAGS = $(GLITZ_AGL_CFLAGS) -DGLITZ_AGL_BACKEND glitzinfo_agl_SOURCES = glitzinfo.c -glitzinfo_agl_LDADD = $(GLITZ_LIB) $(GLITZ_AGL_LIBS) +glitzinfo_agl_LDADD = $(GLITZ_LIB) $(GLITZ_AGL_LIBS) $(CARBON_LIBS) endif if GLITZ_BUILD_EGL_BACKEND diff --git a/examples/glitzinfo/glitzinfo.c b/examples/glitzinfo/glitzinfo.c index b98522f..e5eb7e6 100644 --- a/examples/glitzinfo/glitzinfo.c +++ b/examples/glitzinfo/glitzinfo.c @@ -226,7 +226,7 @@ main (int argc, char **argv) glitz_agl_init (); - dformat = glitz_agl_find_drawable_format (0, 0, 0); + dformat = glitz_agl_find_window_format (0, 0, 0); if (!dformat) { fprintf (stderr, "Error: couldn't find drawable format\n"); |