isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 16:10:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

2007-12-19 Tomas Frydrych <tf@openedhand.com>

Browse Source 
* clutter/Makefile.am:
	* clutter/cogl/gl/cogl-defines.h.in:
	* clutter/pango/pangoclutter-render.c:
	* configure.ac:
	Fixes to allow cross-compilation with mingw (patch by Neil
	Roberts).
	Removed trailing whitespace.
This commit is contained in:
Tomas Frydrych 2007-12-19 16:16:10 +00:00
parent bf66f7a3ec
commit 263d8ea5a0
5 changed files with 56 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2007-12-19 Tomas Frydrych <tf@openedhand.com>
* clutter/Makefile.am:
* clutter/cogl/gl/cogl-defines.h.in:
* clutter/pango/pangoclutter-render.c:
* configure.ac:
Fixes to allow cross-compilation with mingw (patch by Neil
Roberts).
Removed trailing whitespace.
2007-12-18 Øyvind Kolås <pippin@o-hand.com> 2007-12-18 Øyvind Kolås <pippin@o-hand.com>
* clutter/clutter-main.c: (generate_enter_leave_events): synthesize * clutter/clutter-main.c: (generate_enter_leave_events): synthesize

6
clutter/Makefile.am
View File

@ -18,9 +18,9 @@ INCLUDES = \
-I$(top_srcdir)/clutter/cogl \ -I$(top_srcdir)/clutter/cogl \
-I$(top_srcdir)/clutter/cogl/@CLUTTER_COGL@ \ -I$(top_srcdir)/clutter/cogl/@CLUTTER_COGL@ \
-I$(top_srcdir)/clutter/json \ -I$(top_srcdir)/clutter/json \
-DPREFIX=\""$(prefix)"\" \ -DCLUTTER_PREFIX=\""$(prefix)"\" \
-DLIBDIR=\""$(libdir)"\" \ -DCLUTTER_LIBDIR=\""$(libdir)"\" \
-DDATADIR=\""$(datadir)"\" \ -DCLUTTER_DATADIR=\""$(datadir)"\" \
-DG_DISABLE_DEPRECATED \ -DG_DISABLE_DEPRECATED \
-DG_LOG_DOMAIN=\"Clutter\" \ -DG_LOG_DOMAIN=\"Clutter\" \
-DCLUTTER_JSON_API=1 \ -DCLUTTER_JSON_API=1 \

2
clutter/cogl/gl/cogl-defines.h.in
View File

@ -29,7 +29,7 @@
#ifdef WIN32 #ifdef WIN32
#include <windows.h> #include <windows.h>
#include <GL/Glee.h> #include <GL/GLee.h>
#else #else

4
clutter/pango/pangoclutter-render.c
View File

@ -219,9 +219,9 @@ temp_buffer (size_t size)
if (size > alloc) if (size > alloc)
{ {
size = (size + 4095) & ~4095; size = (size + 4095) & ~4095;
free (buffer); g_free (buffer);
alloc = size; alloc = size;
buffer = malloc (size); buffer = g_malloc (size);
} }
return buffer; return buffer;

14
configure.ac
View File

@ -149,12 +149,24 @@ case $clutterbackend in
AC_CHECK_HEADERS([$clutter_gl_header],, AC_CHECK_HEADERS([$clutter_gl_header],,
[AC_MSG_ERROR([Unable to locate required GL headers])]) [AC_MSG_ERROR([Unable to locate required GL headers])])
dnl Use GLee under Windows instead of GL
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"
;;
*)
AC_CHECK_LIB(GL, glEnable, HAVE_LIBGL=yes, HAVE_LIBGL=no) AC_CHECK_LIB(GL, glEnable, HAVE_LIBGL=yes, HAVE_LIBGL=no)
if test "x$HAVE_LIBGL" = "xno"; then if test "x$HAVE_LIBGL" = "xno"; then
AC_MSG_ERROR([libGL not found]); AC_MSG_ERROR([libGL not found]);
fi fi
SDL_LIBS="$SDL_LIBS -lGL" SDL_LIBS="$SDL_LIBS -lGL"
;;
esac
fi fi
;; ;;