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

set OPENGL_LIBS when x-compiling for MSW (patch from Fabian Wenzel)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2002-05-10 12:53:49 +00:00
parent 19bc6aad0d
commit be505a65a5
2 changed files with 323 additions and 357 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

656
configure vendored
View File

File diff suppressed because it is too large Load Diff

24
configure.in
View File

@ -2183,11 +2183,13 @@ fi
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl OpenGL libraries dnl OpenGL libraries
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
if test "$wxUSE_OPENGL" = "yes"; then if test "$wxUSE_OPENGL" = "yes"; then
if test "$wxUSE_MAC" = 1; then if test "$wxUSE_MAC" = 1; then
OPENGL_LIBS="-framework OpenGL -framework AGL" OPENGL_LIBS="-framework OpenGL -framework AGL"
elif test "$wxUSE_MSW" = 1; then
OPENGL_LIBS="-lopengl32 -lglu32"
else else
AC_CHECK_HEADER(GL/gl.h, AC_CHECK_HEADER(GL/gl.h,
[ [
AC_MSG_CHECKING([for -lGL]) AC_MSG_CHECKING([for -lGL])
@ -2216,26 +2218,6 @@ if test "$wxUSE_OPENGL" = "yes"; then
fi fi
]) ])
dnl check for OpenGL libs availability first
dnl -lGL requires -lm with soem OpenGL versions
# AC_CHECK_HEADER(GL/gl.h,
# [
# AC_CHECK_LIB(GL, glFlush,
# [
# OPENGL_LIBS="-lGL -lGLU"
# ],
# [
# AC_CHECK_LIB(MesaGL, glFlush,
# [
# OPENGL_LIBS="-lMesaGL -lMesaGLU"
# ],
# [],
# [-lm])
# ],
# [-lm])
# ])
if test "x$OPENGL_LIBS" = "x"; then if test "x$OPENGL_LIBS" = "x"; then
dnl it should be an error and not a warning because OpenGL is not on dnl it should be an error and not a warning because OpenGL is not on
dnl by default and so if it had been explicitely requested, we dnl by default and so if it had been explicitely requested, we