parent
54313012a1
commit
d24c1c68d1
|
@ -96,7 +96,7 @@ AC_MSG_ERROR([Fatal Error: no Imlib2 detected.]); exit],
|
||||||
`$IMLIB2_CONFIG --libs` `$IMLIB2_CONFIG --cflags`)
|
`$IMLIB2_CONFIG --libs` `$IMLIB2_CONFIG --cflags`)
|
||||||
)
|
)
|
||||||
|
|
||||||
AC_CHECK_LIB(ttf, TT_Init_FreeType, TTF_LIBS=-lttf $LIBS_TTF, [
|
AC_CHECK_LIB(ttf, TT_Init_FreeType, TTF_LIBS="-lttf "$LIBS_TTF, [
|
||||||
echo ""
|
echo ""
|
||||||
echo "ERROR: Evas needs a system with libttf.so (TrueType Font Library)"
|
echo "ERROR: Evas needs a system with libttf.so (TrueType Font Library)"
|
||||||
echo "You can obtain it from:"
|
echo "You can obtain it from:"
|
||||||
|
@ -142,21 +142,21 @@ gl_includes=""
|
||||||
#### Find out about OpenGL
|
#### Find out about OpenGL
|
||||||
PREV_CPPFLAGS=$CPPFLAGS
|
PREV_CPPFLAGS=$CPPFLAGS
|
||||||
CPPFLAGS=$CPPFLAGS" -I/usr/include -I/usr/local/include "$x_cflags
|
CPPFLAGS=$CPPFLAGS" -I/usr/include -I/usr/local/include "$x_cflags
|
||||||
AC_TRY_CPP(GL/gl.h,
|
AC_TRY_CPP([#include <GL/gl.h>],
|
||||||
echo "checking for GL/gl.h... yes"
|
echo "checking for GL/gl.h... yes"
|
||||||
gl_includes=$CPPFLAGS" -I/usr/include -I/usr/local/include "$x_cflags
|
gl_includes=$CPPFLAGS" -I/usr/include -I/usr/local/include "$x_cflags
|
||||||
AC_CHECK_LIB(GL, glBindTexture, have_gl=yes,[
|
AC_CHECK_LIB(GL, glBindTexture, have_gl=yes,[
|
||||||
], -L/usr/local/lib -lGL $X_LDFLAGS $X_EXTRA_LIBS $X_LIBS $LIBS_GL)
|
], -L/usr/local/lib -lGL $X_LDFLAGS $X_EXTRA_LIBS $X_LIBS $LIBS_GL -lm)
|
||||||
)
|
)
|
||||||
if test "x$have_gl" = "xyes"; then
|
if test "x$have_gl" = "xyes"; then
|
||||||
gl_includes=$gl_includes
|
gl_includes=$gl_includes
|
||||||
gl_ldflags=$gl_ldflags" -L/usr/local/lib "$X_LDFLAGS" "$X_EXTRA_LIBS" "$X_LIBS" "$LIBS_GL
|
gl_ldflags=$gl_ldflags" -L/usr/local/lib "$X_LDFLAGS" "$X_EXTRA_LIBS" "$X_LIBS" "$LIBS_GL
|
||||||
gl_libs=$gl_libs" -lGL"
|
gl_libs=$gl_libs" -lGL"
|
||||||
AC_DEFINE(HAVE_GL)
|
AC_DEFINE(HAVE_GL)
|
||||||
AC_TRY_CPP(GL/glu.h,
|
AC_TRY_CPP([#include <GL/glu.h>],
|
||||||
echo "checking for GL/glu.h... yes"
|
echo "checking for GL/glu.h... yes"
|
||||||
AC_CHECK_LIB(GLU, gluBuild2DMipmaps, have_glu=yes,[
|
AC_CHECK_LIB(GLU, gluBuild2DMipmaps, have_glu=yes,[
|
||||||
], $gl_ldflags -lGL -lGLU)
|
], $gl_ldflags -lGL -lGLU -lm)
|
||||||
)
|
)
|
||||||
AC_CHECK_LIB(GLU, gluTessBeginPolygon, ,[
|
AC_CHECK_LIB(GLU, gluTessBeginPolygon, ,[
|
||||||
echo ""
|
echo ""
|
||||||
|
|
|
@ -830,6 +830,8 @@ evas_set_text(Evas e, Evas_Object o, char *text)
|
||||||
oo->current.text = NULL;
|
oo->current.text = NULL;
|
||||||
if (text)
|
if (text)
|
||||||
oo->current.text = strdup(text);
|
oo->current.text = strdup(text);
|
||||||
|
else
|
||||||
|
oo->current.text = strdup("");
|
||||||
oo->previous.text = NULL;
|
oo->previous.text = NULL;
|
||||||
{
|
{
|
||||||
switch (e->current.render_method)
|
switch (e->current.render_method)
|
||||||
|
@ -935,9 +937,9 @@ evas_set_text(Evas e, Evas_Object o, char *text)
|
||||||
}
|
}
|
||||||
o->current.w = (double)oo->current.string.w;
|
o->current.w = (double)oo->current.string.w;
|
||||||
o->current.h = (double)oo->current.string.h;
|
o->current.h = (double)oo->current.string.h;
|
||||||
}
|
|
||||||
o->changed = 1;
|
o->changed = 1;
|
||||||
e->changed = 1;
|
e->changed = 1;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
@ -1070,9 +1072,9 @@ evas_set_font(Evas e, Evas_Object o, char *font, int size)
|
||||||
}
|
}
|
||||||
o->current.w = (double)oo->current.string.w;
|
o->current.w = (double)oo->current.string.w;
|
||||||
o->current.h = (double)oo->current.string.h;
|
o->current.h = (double)oo->current.string.h;
|
||||||
}
|
|
||||||
o->changed = 1;
|
o->changed = 1;
|
||||||
e->changed = 1;
|
e->changed = 1;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue