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

Don't use both -framework OpenGL and -lGL

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@53875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2008-05-31 05:44:14 +00:00
parent 444c36355c
commit e55016647a
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Id: configure.in 53806 2008-05-29 00:45:58Z KO . # From configure.in Id: configure.in 53822 2008-05-29 17:04:18Z KO .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for wxWidgets 2.8.8. # Generated by GNU Autoconf 2.59 for wxWidgets 2.8.8.
# #
@@ -32377,6 +32377,8 @@ echo "$as_me: WARNING: wxGLCanvas not implemented for this port, library will be
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"
elif test "$USE_DARWIN" = 1; then
OPENGL_LIBS=""
else else
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

2
configure.in
View File

@@ -4189,6 +4189,8 @@ if test "$wxUSE_OPENGL" = "yes"; 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"
elif test "$USE_DARWIN" = 1; then
OPENGL_LIBS=""
else else
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)