aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure44
1 files changed, 22 insertions, 22 deletions
diff --git a/configure b/configure
index e74e1a3..1e604f2 100755
--- a/configure
+++ b/configure
@@ -11417,28 +11417,12 @@ _ACEOF
#--------------------------------------------------------------------
# Add platform libs to LIBS or SHLIB_LD_LIBS as necessary.
#--------------------------------------------------------------------
-
-# Check whether --with-glew-includes was given.
-if test "${with_glew_includes+set}" = set; then
- withval=$with_glew_includes; GL_INCLUDES="${GL_INCLUDES} -I\"${withval}\""
-else
- GL_INCLUDES="$GL_INCLUDES -I/usr/local/lib"
-fi
-
-
-# Check whether --with-glew-lib was given.
-if test "${with_glew_lib+set}" = set; then
- withval=$with_glew_lib; GLEW_LIB="${withval}"
-else
- GLEW_LIB="/usr/local/lib"
-fi
-
if test "${TEA_PLATFORM}" = "windows" ; then
- LIBS="${LIBS} ${GLEW_LIB}/libglew32.a -lglu32 -lgdi32 -luser32 -lwsock32"
+ LIBS="${LIBS} -lglu32 -lgdi32 -luser32 -lwsock32"
elif test "${TEA_WINDOWINGSYSTEM}" = "aqua" ; then
- LIBS="${LIBS} -lGLEW -framework OpenGL -framework Carbon"
+ LIBS="${LIBS} -framework Carbon"
else
- LIBS="${LIBS} -lGLEW -lGLU"
+ LIBS="${LIBS} -lGLU"
fi
@@ -11642,6 +11626,22 @@ else
fi
+
+# Check whether --with-glew-includes was given.
+if test "${with_glew_includes+set}" = set; then
+ withval=$with_glew_includes; GL_INCLUDES="${GL_INCLUDES} -I\"${withval}\""
+else
+ GL_INCLUDES="$GL_INCLUDES -I/usr/local/lib"
+fi
+
+
+# Check whether --with-glew-lib was given.
+if test "${with_glew_lib+set}" = set; then
+ withval=$with_glew_lib; GLEW_LIB="${withval}"
+else
+ GLEW_LIB="/usr/local/lib"
+fi
+
if test "$tcl_ok" = "no"; then
GL_LIBS=
GL_INCLUDES=
@@ -11649,12 +11649,12 @@ fi
echo "${ECHO_T}no" >&6; }
else
if test "${TEA_PLATFORM}" = "windows" ; then
- GL_LIBS='-lglu32 -lopengl32'
+ GL_LIBS='${GLEW_LIB}/libglew32.a -lglu32 -lopengl32'
elif test "${TEA_WINDOWINGSYSTEM}" = "aqua" ; then
- GL_LIBS='-framework AGL'
+ GL_LIBS='-lGLEW -framework AGL -framework OpenGL'
GL_INCLUDES=''
else
- GL_LIBS='-lGLU -lGL'
+ GL_LIBS='-lGLEW -lGL'
GL_INCLUDES='-I/usr/include'
fi