comparison configure.in @ 991:12b13601a544

Final touches to OSMesa OpenGL support on Atari, using loadable libraries. Hope SDL 1.2.8 is out soon.
author Patrice Mandin <patmandin@gmail.com>
date Fri, 26 Nov 2004 16:16:50 +0000
parents 475166d13b44
children 027688378762
comparison
equal deleted inserted replaced
990:8e20c48a9c13 991:12b13601a544
1131 1131
1132 dnl Check for Mesa offscreen rendering 1132 dnl Check for Mesa offscreen rendering
1133 CheckAtariOSMesa() 1133 CheckAtariOSMesa()
1134 { 1134 {
1135 if test "x$enable_video" = "xyes" -a "x$enable_video_opengl" = "xyes"; then 1135 if test "x$enable_video" = "xyes" -a "x$enable_video_opengl" = "xyes"; then
1136 AC_CHECK_HEADER(GL/osmesa.h, have_osmesa_hdr=yes)
1137 AC_CHECK_LIB(OSMesa, OSMesaCreateContext, have_osmesa_lib=yes, have_osmesa_lib=no, -lm)
1138
1139 # Static linking to -lOSMesa
1136 AC_PATH_PROG(OSMESA_CONFIG, osmesa-config, no) 1140 AC_PATH_PROG(OSMESA_CONFIG, osmesa-config, no)
1137 if test "x$OSMESA_CONFIG" = "xno" -o "x$enable_atari_ldg" = "xno"; then 1141 if test "x$OSMESA_CONFIG" = "xno" -o "x$enable_atari_ldg" = "xno"; then
1138 AC_CHECK_HEADER(GL/osmesa.h, have_osmesa_hdr=yes) 1142 # -lOSMesa is really the static library
1139 AC_CHECK_LIB(OSMesa, OSMesaCreateContext, have_osmesa_lib=yes, have_osmesa_lib=no, -lm)
1140 if test "x$have_osmesa_hdr" = "xyes" -a "x$have_osmesa_lib" = "xyes"; then 1143 if test "x$have_osmesa_hdr" = "xyes" -a "x$have_osmesa_lib" = "xyes"; then
1141 CFLAGS="$CFLAGS -DHAVE_OPENGL" 1144 CFLAGS="$CFLAGS -DHAVE_OPENGL"
1142 SYSTEM_LIBS="$SYSTEM_LIBS -lOSMesa" 1145 SYSTEM_LIBS="$SYSTEM_LIBS -lOSMesa"
1143 fi 1146 fi
1144 else 1147 else
1148 # -lOSMesa is a loader for OSMesa.ldg
1145 OSMESA_CFLAGS=`$OSMESA_CONFIG --cflags` 1149 OSMESA_CFLAGS=`$OSMESA_CONFIG --cflags`
1146 OSMESA_LIBS=`$OSMESA_CONFIG --libs` 1150 OSMESA_LIBS=`$OSMESA_CONFIG --libs`
1147 CFLAGS="$CFLAGS -DHAVE_OPENGL $OSMESA_CFLAGS" 1151 CFLAGS="$CFLAGS -DHAVE_OPENGL $OSMESA_CFLAGS"
1148 SYSTEM_LIBS="$SYSTEM_LIBS $OSMESA_LIBS" 1152 SYSTEM_LIBS="$SYSTEM_LIBS $OSMESA_LIBS"
1149 fi 1153 fi
1154
1155 AC_ARG_ENABLE(osmesa-shared,
1156 [ --enable-osmesa-shared dynamically load OSMesa OpenGL support [default=yes]],
1157 , enable_osmesa_shared=yes)
1158 if test "x$enable_osmesa_shared" = "xyes" -a "x$enable_atari_ldg" = "xyes"; then
1159 # Dynamic linking
1160 if test "x$have_osmesa_hdr" = "xyes"; then
1161 CFLAGS="$CFLAGS -DENABLE_OSMESA_SHARED"
1162 fi
1163 fi
1150 fi 1164 fi
1151 } 1165 }
1152 1166
1153 dnl See if we can use the new unified event interface in Linux 2.4 1167 dnl See if we can use the new unified event interface in Linux 2.4
1154 CheckInputEvents() 1168 CheckInputEvents()