mirror of
https://github.com/brl/mutter.git
synced 2024-12-23 03:22:04 +00:00
Use the Mesa headers instead of depending on GLee for Win32
builds. * configure.ac: No longer check for GLee * clutter/cogl/gl/cogl-defines.h.in: Don't bother including GLee.h * build/mingw/mingw-cross-compile.sh: No longer downloads libGLee but downloads the Mesa library instead and installs the headers from that. Fixed the libpng version.
This commit is contained in:
parent
889222f7d5
commit
14a48008cd
13
ChangeLog
13
ChangeLog
@ -1,3 +1,16 @@
|
||||
2008-05-16 Neil Roberts <neil@o-hand.com>
|
||||
|
||||
Use the Mesa headers instead of depending on GLee for Win32
|
||||
builds.
|
||||
|
||||
* configure.ac: No longer check for GLee
|
||||
|
||||
* clutter/cogl/gl/cogl-defines.h.in: Don't bother including GLee.h
|
||||
|
||||
* build/mingw/mingw-cross-compile.sh: No longer downloads libGLee
|
||||
but downloads the Mesa library instead and installs the headers
|
||||
from that. Fixed the libpng version.
|
||||
|
||||
2008-05-16 Tomas Frydrych <tf@openedhand.com>
|
||||
|
||||
* clutter/glx/Makefile.am:
|
||||
|
@ -26,13 +26,13 @@ SF_URL="http://surfnet.dl.sourceforge.net/sourceforge";
|
||||
OTHER_DEPS=( \
|
||||
"http://www.gimp.org/~tml/gimp/win32/libiconv-1.9.1.bin.woe32.zip" \
|
||||
"${SF_URL}/libpng/zlib123-dll.zip" \
|
||||
"http://elf-stone.com/downloads/GLee/GLee5_21.zip" \
|
||||
"http://www.libsdl.org/release/SDL-devel-1.2.12-mingw32.tar.gz" );
|
||||
"http://www.libsdl.org/release/SDL-devel-1.2.12-mingw32.tar.gz" \
|
||||
"${SF_URL}/mesa3d/MesaLib-7.0.3.tar.bz2" );
|
||||
|
||||
GNUWIN32_URL="${SF_URL}/gnuwin32";
|
||||
|
||||
GNUWIN32_DEPS=( \
|
||||
libpng-1.2.24-{bin,lib}.zip \
|
||||
libpng-1.2.8-{bin,lib}.zip \
|
||||
jpeg-6b-4-{bin,lib}.zip \
|
||||
tiff-3.8.2-1-{bin,lib}.zip );
|
||||
|
||||
@ -306,37 +306,14 @@ sed -e 's/^Cflags:.*$/Cflags: -I${includedir}\/pango-1.0 -I${includedir}\/freety
|
||||
> "$ROOT_DIR/lib/pkgconfig/pangoft2.pc.tmp";
|
||||
mv "$ROOT_DIR/lib/pkgconfig/pangoft2.pc"{.tmp,};
|
||||
|
||||
##
|
||||
# Build GLee
|
||||
##
|
||||
|
||||
if y_or_n "Do you want to build and install libGLee?"; then
|
||||
guess_dir GLEE_BUILD_DIR "glee" \
|
||||
"the build directory for libGLee" "Build dir";
|
||||
|
||||
find_compiler;
|
||||
|
||||
do_unzip_d "$GLEE_BUILD_DIR" "$DOWNLOAD_DIR/GLee5_21.zip" GLee.{c,h};
|
||||
|
||||
if ! ( cd "$GLEE_BUILD_DIR" \
|
||||
&& "${CC}" -Wall -O2 -c -o GLee.o GLee.c \
|
||||
&& "${AR}" r libGLee.a GLee.o \
|
||||
&& "${RANLIB}" libGLee.a ); then
|
||||
echo "Failed to build libGLee";
|
||||
echo "Extracting Mesa headers...";
|
||||
if ! tar -C "$ROOT_DIR" \
|
||||
-jxf "$DOWNLOAD_DIR/MesaLib-7.0.3.tar.bz2" \
|
||||
--strip 1 Mesa-7.0.3/include; then
|
||||
echo "Failed to extract Mesa headers";
|
||||
exit 1;
|
||||
fi;
|
||||
|
||||
if ! [ -d "$ROOT_DIR/include/GL" ]; then
|
||||
mkdir "$ROOT_DIR/include/GL";
|
||||
fi;
|
||||
|
||||
if ! ( cp -p "$GLEE_BUILD_DIR/libGLee.a" "$ROOT_DIR/lib/" \
|
||||
&& cp -p "$GLEE_BUILD_DIR/GLee.h" "$ROOT_DIR/include/GL" ); then
|
||||
echo "Failed to copy libGLee to root directory";
|
||||
exit 1;
|
||||
fi;
|
||||
fi;
|
||||
|
||||
##
|
||||
# Build
|
||||
##
|
||||
|
@ -26,17 +26,8 @@
|
||||
#ifndef __COGL_DEFINES_H__
|
||||
#define __COGL_DEFINES_H__
|
||||
|
||||
#ifdef WIN32
|
||||
|
||||
#include <windows.h>
|
||||
#include <GL/GLee.h>
|
||||
|
||||
#else
|
||||
|
||||
#include <@CLUTTER_GL_HEADER@>
|
||||
|
||||
#endif /* WIN32 */
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
typedef GLenum COGLenum;
|
||||
|
17
configure.ac
17
configure.ac
@ -264,15 +264,10 @@ case $clutterbackend in
|
||||
AC_CHECK_HEADERS([$clutter_gl_header],,
|
||||
[AC_MSG_ERROR([Unable to locate required GL headers])])
|
||||
|
||||
dnl Use GLee under Windows instead of GL
|
||||
dnl Use -lopengl32 under Windows instead of -lGL
|
||||
case "$host" in
|
||||
*mingw32*)
|
||||
AC_CHECK_LIB(GLee, GLeeInit, HAVE_LIBGLEE=yes, HAVE_LIBGLEE=no, -lopengl32)
|
||||
if test "x$HAVE_LIBGLEE" = "xno"; then
|
||||
AC_MSG_ERROR([libGLee not found]);
|
||||
fi
|
||||
|
||||
SDL_LIBS="$SDL_LIBS -lGLee -lopengl32"
|
||||
SDL_LIBS="$SDL_LIBS -lopengl32"
|
||||
CLUTTER_LT_LDFLAGS="$CLUTTER_LT_LDFLAGS -no-undefined"
|
||||
;;
|
||||
*)
|
||||
@ -383,14 +378,8 @@ case $clutterbackend in
|
||||
AC_CHECK_HEADERS([$clutter_gl_header],,
|
||||
[AC_MSG_ERROR([Unable to locate required GL headers])])
|
||||
|
||||
dnl Use GLee under Windows instead of GL
|
||||
AC_CHECK_LIB(GLee, GLeeInit, HAVE_LIBGLEE=yes, HAVE_LIBGLEE=no, -lopengl32)
|
||||
if test "x$HAVE_LIBGLEE" = "xno"; then
|
||||
AC_MSG_ERROR([libGLee not found]);
|
||||
fi
|
||||
|
||||
WIN32_CFLAGS="-D_WIN32_WINNT=0x0500"
|
||||
WIN32_LIBS="-lGLee -lopengl32 -lgdi32 -lwinmm"
|
||||
WIN32_LIBS="-lopengl32 -lgdi32 -lwinmm"
|
||||
CLUTTER_LT_LDFLAGS="$CLUTTER_LT_LDFLAGS -no-undefined"
|
||||
;;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user