fix wxOS2 build where OpenGL headers are available but there's no wxGlCanvas implementation available
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
4de60a27a7
commit
0dd9646ea8
17
configure
vendored
17
configure
vendored
@ -1,5 +1,5 @@
|
|||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# From configure.in Id: configure.in 57205 2008-12-08 19:33:08Z FM .
|
# From configure.in Id: configure.in 57209 2008-12-08 23:19:37Z FM .
|
||||||
# Guess values for system-dependent variables and create Makefiles.
|
# Guess values for system-dependent variables and create Makefiles.
|
||||||
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
|
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
|
||||||
#
|
#
|
||||||
@ -33129,15 +33129,14 @@ fi
|
|||||||
|
|
||||||
USE_OPENGL=0
|
USE_OPENGL=0
|
||||||
if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then
|
if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then
|
||||||
if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then
|
|
||||||
{ echo "$as_me:$LINENO: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&5
|
|
||||||
echo "$as_me: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&2;}
|
if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then
|
||||||
wxUSE_OPENGL="no"
|
|
||||||
elif test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then
|
|
||||||
OPENGL_LIBS="-framework OpenGL -framework AGL"
|
OPENGL_LIBS="-framework OpenGL -framework AGL"
|
||||||
elif test "$wxUSE_MSW" = 1; then
|
elif test "$wxUSE_MSW" = 1; then
|
||||||
OPENGL_LIBS="-lopengl32 -lglu32"
|
OPENGL_LIBS="-lopengl32 -lglu32"
|
||||||
else
|
elif test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_GTK2" = 1 -o "$wxUSE_GTK" = 1; then
|
||||||
|
|
||||||
{ echo "$as_me:$LINENO: checking for OpenGL headers" >&5
|
{ echo "$as_me:$LINENO: checking for OpenGL headers" >&5
|
||||||
echo $ECHO_N "checking for OpenGL headers... $ECHO_C" >&6; }
|
echo $ECHO_N "checking for OpenGL headers... $ECHO_C" >&6; }
|
||||||
|
|
||||||
@ -33408,6 +33407,10 @@ echo "$as_me: WARNING: OpenGL libraries not available, disabling support for Ope
|
|||||||
else
|
else
|
||||||
wxUSE_OPENGL=yes
|
wxUSE_OPENGL=yes
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
{ echo "$as_me:$LINENO: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&5
|
||||||
|
echo "$as_me: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&2;}
|
||||||
|
wxUSE_OPENGL="no"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$wxUSE_OPENGL" = "yes"; then
|
if test "$wxUSE_OPENGL" = "yes"; then
|
||||||
|
14
configure.in
14
configure.in
@ -3632,14 +3632,15 @@ dnl ---------------------------------------------------------------------------
|
|||||||
|
|
||||||
USE_OPENGL=0
|
USE_OPENGL=0
|
||||||
if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then
|
if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then
|
||||||
if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then
|
|
||||||
AC_MSG_WARN([wxGLCanvas not implemented for this port, library will be compiled without it.])
|
dnl look in glcanvas.h for the list of platforms supported by wxGlCanvas:
|
||||||
wxUSE_OPENGL="no"
|
|
||||||
elif test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then
|
if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then
|
||||||
OPENGL_LIBS="-framework OpenGL -framework AGL"
|
OPENGL_LIBS="-framework OpenGL -framework AGL"
|
||||||
elif test "$wxUSE_MSW" = 1; then
|
elif test "$wxUSE_MSW" = 1; then
|
||||||
OPENGL_LIBS="-lopengl32 -lglu32"
|
OPENGL_LIBS="-lopengl32 -lglu32"
|
||||||
else
|
elif test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_GTK2" = 1 -o "$wxUSE_GTK" = 1; then
|
||||||
|
|
||||||
dnl adjust CPPFLAGS to include GL/gl.h location if necessary
|
dnl adjust CPPFLAGS to include GL/gl.h location if necessary
|
||||||
dnl (/opt/graphics/OpenGL is for HP-UX systems, bug 925307)
|
dnl (/opt/graphics/OpenGL is for HP-UX systems, bug 925307)
|
||||||
AC_MSG_CHECKING([for OpenGL headers])
|
AC_MSG_CHECKING([for OpenGL headers])
|
||||||
@ -3718,6 +3719,9 @@ if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then
|
|||||||
dnl libraries are available... change 'auto' in 'yes'
|
dnl libraries are available... change 'auto' in 'yes'
|
||||||
wxUSE_OPENGL=yes
|
wxUSE_OPENGL=yes
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
AC_MSG_WARN([wxGLCanvas not implemented for this port, library will be compiled without it.])
|
||||||
|
wxUSE_OPENGL="no"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$wxUSE_OPENGL" = "yes"; then
|
if test "$wxUSE_OPENGL" = "yes"; then
|
||||||
|
Loading…
Reference in New Issue
Block a user