Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed handling of --with-opengl=auto (default value) for Mac/MSW (it behaved as --without-opengl before)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-07-01 09:33:21 +00:00
parent be5be16a23
commit 3dd63e0241
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@@ -33400,8 +33400,6 @@ echo "$as_me: WARNING: OpenGL libraries not available, disabling support for Ope
wxUSE_OPENGL=no wxUSE_OPENGL=no
USE_OPENGL=0 USE_OPENGL=0
fi fi
else
wxUSE_OPENGL=yes
fi fi
else else
{ echo "$as_me:$LINENO: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&5 { echo "$as_me:$LINENO: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&5
@@ -33409,6 +33407,10 @@ echo "$as_me: WARNING: wxGLCanvas not implemented for this port, library will be
wxUSE_OPENGL="no" wxUSE_OPENGL="no"
fi fi
if test "$wxUSE_OPENGL" = "auto"; then
wxUSE_OPENGL=yes
fi
if test "$wxUSE_OPENGL" = "yes"; then if test "$wxUSE_OPENGL" = "yes"; then
USE_OPENGL=1 USE_OPENGL=1
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF

10
configure.in
View File

@@ -3671,15 +3671,19 @@ if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then
wxUSE_OPENGL=no wxUSE_OPENGL=no
USE_OPENGL=0 USE_OPENGL=0
fi fi
else
dnl libraries are available... change 'auto' in 'yes'
wxUSE_OPENGL=yes
fi fi
else else
AC_MSG_WARN([wxGLCanvas not implemented for this port, library will be compiled without it.]) AC_MSG_WARN([wxGLCanvas not implemented for this port, library will be compiled without it.])
wxUSE_OPENGL="no" wxUSE_OPENGL="no"
fi fi
if test "$wxUSE_OPENGL" = "auto"; then
dnl if the OpenGL libraries were unavailable, this would have been
dnl changed to "no" above, if it wasn't, change it to "yes" as we've
dnl verified that we can indeed use OpenGL
wxUSE_OPENGL=yes
fi
if test "$wxUSE_OPENGL" = "yes"; then if test "$wxUSE_OPENGL" = "yes"; then
USE_OPENGL=1 USE_OPENGL=1
AC_DEFINE(wxUSE_OPENGL) AC_DEFINE(wxUSE_OPENGL)