From 5c0c1289d61572ff59130023a1394cfac9e52cdd Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Mon, 14 Aug 2000 16:43:52 +0000 Subject: [PATCH] endianess chekc for texture gneration SVN revision: 3118 --- legacy/evas/configure.in | 1 + legacy/evas/src/Makefile.am | 8 ++++---- legacy/evas/src/evas_gl_routines.c | 8 ++++++++ legacy/evas/test/Makefile.am | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/legacy/evas/configure.in b/legacy/evas/configure.in index 199c20646d..2c536055c7 100644 --- a/legacy/evas/configure.in +++ b/legacy/evas/configure.in @@ -1,6 +1,7 @@ AC_INIT(src/Evas.h) AM_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE(evas, 0.0.1) +AC_C_BIGENDIAN AC_PROG_CC AM_PROG_CC_STDC AM_WITH_DMALLOC diff --git a/legacy/evas/src/Makefile.am b/legacy/evas/src/Makefile.am index 6949515d43..10eac1dc0b 100644 --- a/legacy/evas/src/Makefile.am +++ b/legacy/evas/src/Makefile.am @@ -7,18 +7,18 @@ MAINTAINERCLEANFILES = Makefile.in LIBS_X = @x_ldflags@ @x_libs@ LIBS_IMLIB2 = -lImlib2 -lttf -ldl -lm -LIBS_DB = -ledb +#LIBS_DB = -ledb LIBS_GL = -lGLU -lGL LIBS_EXTRA = -L/usr/local/lib CFLAGS_X = @x_cflags@ CFLAGS_IMLIB2 = -CFLAGS_DB = +#CFLAGS_DB = CFLAGS_GL = @gl_includes@ CFLAGS_EXTRA = -I$(includedir) -I$(top_srcdir) -I/usr/local/include -LIBS_ALL = $(LIBS_X) $(LIBS_IMLIB2) $(LIBS_DB) $(LIBS_GL) $(LIBS_EXTRA) -CFLGAS_ALL = $(CFLAGS_X) $(CFLAGS_IMLIB2) $(CFLAGS_DB) $(CFLAGS_GL) $(CFLAGS_EXTRA) +LIBS_ALL = $(LIBS_X) $(LIBS_IMLIB2) $(LIBS_GL) $(LIBS_EXTRA) +CFLGAS_ALL = $(CFLAGS_X) $(CFLAGS_IMLIB2) $(CFLAGS_GL) $(CFLAGS_EXTRA) INCLUDES = $(CFLGAS_ALL) \ -DLIBDIR=\"$(libdir)\" \ diff --git a/legacy/evas/src/evas_gl_routines.c b/legacy/evas/src/evas_gl_routines.c index 6f01e184e7..7be4fd01fd 100644 --- a/legacy/evas/src/evas_gl_routines.c +++ b/legacy/evas/src/evas_gl_routines.c @@ -128,11 +128,19 @@ __evas_gl_image_copy_image_rect_to_texture(Evas_GL_Image *im, int x, int y, p2 = data + (ty * tw); for (tx = 0; tx < w; tx++) { +#ifndef WORDS_BIGENDIAN *p2 = ((*p1 & 0xff000000)) | ((*p1 & 0x00ff0000) >> 16) | ((*p1 & 0x0000ff00)) | ((*p1 & 0x000000ff) << 16); +#else + *p2 = + ((*p1 & 0xff000000) >> 24) | + ((*p1 & 0x00ff0000) << 8) | + ((*p1 & 0x0000ff00) << 8) | + ((*p1 & 0x000000ff) << 8); +#endif p2++; p1++; } if (tx < tw) diff --git a/legacy/evas/test/Makefile.am b/legacy/evas/test/Makefile.am index 7f56cd6af7..7de78cb271 100644 --- a/legacy/evas/test/Makefile.am +++ b/legacy/evas/test/Makefile.am @@ -1,7 +1,7 @@ CFLAGS_X = @x_cflags@ CFLAGS_EXTRA = -I$(includedir) -I$(top_srcdir) -I$(top_srcdir)/src -I/usr/local/include -CFLGAS_ALL = $(CFLAGS_X) $(CFLAGS_IMLIB2) $(CFLAGS_DB) $(CFLAGS_GL) $(CFLAGS_EXTRA) +CFLGAS_ALL = $(CFLAGS_X) $(CFLAGS_EXTRA) INCLUDES = $(CFLGAS_ALL)