version 1.182, 2005/06/22 07:58:14
|
version 1.183, 2005/07/01 14:44:35
|
Line 273 fi
|
Line 273 fi
|
|
|
# mesa (software) gl implementation is default with wx (hardware gl implem can be choosen with --with-gl option) |
# mesa (software) gl implementation is default with wx (hardware gl implem can be choosen with --with-gl option) |
if test "$with_wx" = "yes" ; then |
if test "$with_wx" = "yes" ; then |
|
if test "$AMAYAOS" = "MACOSX" ; then |
|
with_mesa="no" |
|
with_gl="yes" |
|
else |
if test "$with_gl" = "no" ; then |
if test "$with_gl" = "no" ; then |
with_mesa="yes" |
with_mesa="yes" |
fi |
fi |
|
fi |
fi |
fi |
|
|
# check if no gui is enable |
# check if no gui is enable |
Line 733 if test "$with_gl" = "yes" -o "$with_mes
|
Line 738 if test "$with_gl" = "yes" -o "$with_mes
|
LDFLAGS="-L/usr/X11R6/lib -L/usr/lib -L/usr/local/lib" |
LDFLAGS="-L/usr/X11R6/lib -L/usr/lib -L/usr/local/lib" |
AC_MSG_CHECKING([OpenGL]) |
AC_MSG_CHECKING([OpenGL]) |
for ac_dir in \ |
for ac_dir in \ |
/usr/include \ |
/usr/include \ |
/usr/X11R6/include \ |
/usr/X11R6/include \ |
/usr/local/include \ |
/usr/local/include \ |
; \ |
; \ |
Line 751 if test "$with_gl" = "yes" -o "$with_mes
|
Line 756 if test "$with_gl" = "yes" -o "$with_mes
|
|
|
AC_MSG_CHECKING([GLU]) |
AC_MSG_CHECKING([GLU]) |
for ac_dir in \ |
for ac_dir in \ |
/usr/include \ |
/usr/include \ |
/usr/X11R6/include \ |
/usr/X11R6/include \ |
/usr/local/include \ |
/usr/local/include \ |
; \ |
; \ |
do if test -r "$ac_dir/GL/glu.h" ; then |
do if test -r "$ac_dir/GL/glu.h" ; then |
Line 795 if test "$with_gl" = "yes" -o "$with_mes
|
Line 800 if test "$with_gl" = "yes" -o "$with_mes
|
|
|
if test "$with_mac" = "yes" ; then |
if test "$with_mac" = "yes" ; then |
GL_OPTIONS="-D_GL" |
GL_OPTIONS="-D_GL" |
GL_INCLUDES="-I/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers/" |
GL_INCLUDES="-I/System/Library/Frameworks/OpenGL.framework/Versions/Current/Headers/" |
GL_LIBRARIES="" |
GL_LIBRARIES="" |
|
GL_BUILDDIR="" |
else |
else |
GL_LIBRARIES="-L/usr/lib -L/usr/X11R6/lib -lGL -lGLU" |
GL_LIBRARIES="-L/usr/lib -L/usr/X11R6/lib -lGL -lGLU" |
GL_OPTIONS="-D_GL" |
GL_OPTIONS="-D_GL" |