kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* remove module_la_DEPENDENCIES useless variable 

* add -fno-rtti and -fno-exceptions when c++ is used (in Windows engines)
 * fix glew engine compilation
 * minor formatting


SVN revision: 37369
This commit is contained in:
Vincent Torri 2008-11-01 09:46:51 +00:00
parent 5be63df7c0
commit b7d5746e0d
38 changed files with 28 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
legacy/evas/src/modules/engines/buffer/Makefile.am
View File

@ -24,7 +24,6 @@ evas_outbuf.c
module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
module_la_DEPENDENCIES = $(top_builddir)/config.h
include_HEADERS = Evas_Engine_Buffer.h

21
legacy/evas/src/modules/engines/cairo_common/Makefile.am
View File

@ -1,22 +1,23 @@
MAINTAINERCLEANFILES = Makefile.in
AM_CPPFLAGS = -I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include \
@FREETYPE_CFLAGS@ @CAIRO_CFLAGS@ @EINA_CFLAGS@
AM_CPPFLAGS = \
-I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include \
@FREETYPE_CFLAGS@ \
@CAIRO_CFLAGS@ \
@EINA_CFLAGS@
if BUILD_ENGINE_CAIRO_COMMON
noinst_LTLIBRARIES = libevas_engine_cairo_common.la
libevas_engine_cairo_common_la_SOURCES = \
noinst_LTLIBRARIES = libevas_engine_cairo_common.la
libevas_engine_cairo_common_la_SOURCES = \
evas_cairo_private.h \
evas_cairo_common.h \
evas_cairo_main.c
libevas_engine_cairo_common_la_LIBADD = @EINA_LIBS@ @CAIRO_LIBS@ $(top_builddir)/src/lib/libevas.la
libevas_engine_cairo_common_la_DEPENDENCIES = \
$(top_builddir)/config.h
libevas_engine_cairo_common_la_LIBADD = @EINA_LIBS@ @CAIRO_LIBS@ $(top_builddir)/src/lib/libevas.la
endif

11
legacy/evas/src/modules/engines/cairo_x11/Makefile.am
View File

@ -1,7 +1,15 @@
MAINTAINERCLEANFILES = Makefile.in
AM_CPPFLAGS = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include -I$(top_srcdir)/src/modules/engines/cairo_common @FREETYPE_CFLAGS@ @x_cflags@ @CAIRO_CFLAGS@ @EINA_CFLAGS@
AM_CPPFLAGS = \
-I. \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib/include \
-I$(top_srcdir)/src/modules/engines/cairo_common \
@FREETYPE_CFLAGS@ \
@x_cflags@ \
@CAIRO_CFLAGS@ \
@EINA_CFLAGS@
if BUILD_ENGINE_CAIRO_X11
@ -17,7 +25,6 @@ evas_x_main.c
module_la_LIBADD = @EINA_LIBS@ @CAIRO_LIBS@ @x_libs@ $(top_builddir)/src/modules/engines/cairo_common/libevas_engine_cairo_common.la $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
module_la_DEPENDENCIES = $(top_builddir)/config.h
include_HEADERS = Evas_Engine_Cairo_X11.h

2
legacy/evas/src/modules/engines/direct3d/Makefile.am
View File

@ -21,10 +21,10 @@ evas_outbuf.c \
evas_direct3d_buffer.c \
evas_direct3d_main.cpp
module_la_CXXFLAGS = -fno-rtti -fno-exceptions
module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la @direct3d_libs@
module_la_LDFLAGS = @lt_no_undefined@ -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
module_la_DEPENDENCIES = $(top_builddir)/config.h
include_HEADERS = Evas_Engine_Direct3D.h

1
legacy/evas/src/modules/engines/directfb/Makefile.am
View File

@ -23,7 +23,6 @@ module_la_SOURCES = evas_engine.c polygon.c
module_la_LIBADD = @EINA_LIBS@ @DIRECTFB_LIBS@ $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = @lt_no_undefined@ -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
module_la_DEPENDENCIES = $(top_builddir)/config.h
include_HEADERS = Evas_Engine_DirectFB.h

2
legacy/evas/src/modules/engines/gl_common/Makefile.am
View File

@ -26,8 +26,6 @@ evas_gl_rectangle.c \
evas_gl_texture.c
libevas_engine_gl_common_la_LIBADD = @EINA_LIBS@ @gl_libs@ $(top_builddir)/src/lib/libevas.la
libevas_engine_gl_common_la_DEPENDENCIES = $(top_builddir)/config.h
endif
EXTRA_DIST = \

8
legacy/evas/src/modules/engines/gl_common/evas_gl_common.h
View File

@ -20,6 +20,10 @@
#include <sys/time.h>
#include <unistd.h>
#ifdef BUILD_ENGINE_GL_GLEW
#include <GL/glew.h>
#endif /* BUILD_ENGINE_GL_GLEW */
#ifdef BUILD_ENGINE_GL_QUARTZ
#include <OpenGL/gl.h>
#include <OpenGL/glu.h>
@ -28,10 +32,6 @@
#include <GL/glu.h>
#endif /* BUILD_ENGINE_GL_QUARTZ */
#ifdef BUILD_ENGINE_GL_GLEW
#include <GL/glew.h>
#endif /* BUILD_ENGINE_GL_GLEW */
typedef struct _Evas_GL_Context Evas_GL_Context;
typedef struct _Evas_GL_Texture Evas_GL_Texture;
typedef struct _Evas_GL_Image Evas_GL_Image;

1
legacy/evas/src/modules/engines/gl_glew/Makefile.am
View File

@ -23,7 +23,6 @@ evas_glew_main.c
module_la_LIBADD = $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la $(top_builddir)/src/lib/libevas.la @gl_libs@ @glew_libs@
module_la_LDFLAGS = @lt_no_undefined@ -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
module_la_DEPENDENCIES = $(top_builddir)/config.h
include_HEADERS = Evas_Engine_GL_Glew.h

1
legacy/evas/src/modules/engines/gl_x11/Makefile.am
View File

@ -25,7 +25,6 @@ evas_x_main.c
module_la_LIBADD = @EINA_LIBS@ @gl_libs@ @x_libs@ $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
module_la_DEPENDENCIES = $(top_builddir)/config.h
include_HEADERS = Evas_Engine_GL_X11.h

1
legacy/evas/src/modules/engines/glitz_x11/Makefile.am
View File

@ -28,7 +28,6 @@ evas_engine_gradient.c
module_la_LIBADD = @EINA_LIBS@ @x_libs@ @GLITZ_LIBS@ $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
module_la_DEPENDENCIES = $(top_builddir)/config.h
include_HEADERS = Evas_Engine_Glitz_X11.h

1
legacy/evas/src/modules/engines/quartz/Makefile.am
View File

@ -16,7 +16,6 @@ evas_engine.c
module_la_LIBADD = @EINA_LIBS@ @quartz_libs@ $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
module_la_DEPENDENCIES = $(top_builddir)/config.h
include_HEADERS = Evas_Engine_Quartz.h

1
legacy/evas/src/modules/engines/software_16/Makefile.am
View File

@ -22,6 +22,5 @@ evas_engine.c
module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
module_la_DEPENDENCIES = $(top_builddir)/config.h
endif

2
legacy/evas/src/modules/engines/software_16_ddraw/Makefile.am
View File

@ -22,10 +22,10 @@ evas_engine.c \
evas_ddraw_buffer.cpp \
evas_ddraw_main.cpp
module_la_CXXFLAGS = -fno-rtti -fno-exceptions
module_la_LIBADD = @EINA_LIBS@ @ddraw_16_libs@ $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = @lt_no_undefined@ -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
module_la_DEPENDENCIES = $(top_builddir)/config.h
include_HEADERS = Evas_Engine_Software_16_DDraw.h

1
legacy/evas/src/modules/engines/software_16_sdl/Makefile.am
View File

@ -16,7 +16,6 @@ evas_engine.h
module_la_LIBADD = @EINA_LIBS@ @SDL_LIBS@ $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = @lt_no_undefined@ -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
module_la_DEPENDENCIES = $(top_builddir)/config.h
include_HEADERS = Evas_Engine_SDL_16.h

2
legacy/evas/src/modules/engines/software_16_wince/Makefile.am
View File

@ -28,10 +28,10 @@ evas_wince_ddraw_buffer.cpp \
evas_wince_gapi.rc
module_la_CFLAGS = @WIN32_CFLAGS@
module_la_CXXFLAGS = -fno-rtti -fno-exceptions
module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
module_la_DEPENDENCIES = $(top_builddir)/config.h
include_HEADERS = Evas_Engine_Software_16_WinCE.h

1
legacy/evas/src/modules/engines/software_16_x11/Makefile.am
View File

@ -25,7 +25,6 @@ evas_x_buffer.c
module_la_LIBADD = @EINA_LIBS@ @x_libs@ $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
module_la_DEPENDENCIES = $(top_builddir)/config.h
include_HEADERS = Evas_Engine_Software_16_X11.h

2
legacy/evas/src/modules/engines/software_ddraw/Makefile.am
View File

@ -21,10 +21,10 @@ evas_outbuf.c \
evas_ddraw_buffer.c \
evas_ddraw_main.cpp
module_la_CXXFLAGS = -fno-rtti -fno-exceptions
module_la_LIBADD = @EINA_LIBS@ @ddraw_libs@ $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = @lt_no_undefined@ -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
module_la_DEPENDENCIES = $(top_builddir)/config.h
include_HEADERS = Evas_Engine_Software_DDraw.h

1
legacy/evas/src/modules/engines/software_generic/Makefile.am
View File

@ -20,4 +20,3 @@ module_la_SOURCES = evas_engine.c
module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
module_la_DEPENDENCIES = $(top_builddir)/config.h

1
legacy/evas/src/modules/engines/software_qtopia/Makefile.am
View File

@ -26,7 +26,6 @@ evas_qt_main.cpp
module_la_LIBADD = @EINA_LIBS@ @qt_libs@ $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
module_la_DEPENDENCIES = $(top_builddir)/config.h
include_HEADERS = Evas_Engine_Software_Qtopia.h

1
legacy/evas/src/modules/engines/software_sdl/Makefile.am
View File

@ -23,7 +23,6 @@ module_la_SOURCES = evas_engine.c
module_la_LIBADD = @EINA_LIBS@ @SDL_LIBS@ $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = @lt_no_undefined@ -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
module_la_DEPENDENCIES = $(top_builddir)/config.h
include_HEADERS = Evas_Engine_SDL.h

1
legacy/evas/src/modules/engines/software_x11/Makefile.am
View File

@ -27,7 +27,6 @@ evas_x_main.c
module_la_LIBADD = @EINA_LIBS@ @x_libs@ $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
module_la_DEPENDENCIES = $(top_builddir)/config.h
include_HEADERS = Evas_Engine_Software_X11.h

1
legacy/evas/src/modules/engines/software_xcb/Makefile.am
View File

@ -27,7 +27,6 @@ evas_xcb_main.c
module_la_LIBADD = @EINA_LIBS@ @XCB_LIBS@ $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
module_la_DEPENDENCIES = $(top_builddir)/config.h
include_HEADERS = Evas_Engine_Software_Xcb.h

1
legacy/evas/src/modules/engines/xrender_x11/Makefile.am
View File

@ -28,7 +28,6 @@ evas_engine_gradient.c
module_la_LIBADD = @EINA_LIBS@ @x_libs@ -lXrender $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
module_la_DEPENDENCIES = $(top_builddir)/config.h
include_HEADERS = Evas_Engine_XRender_X11.h

1
legacy/evas/src/modules/engines/xrender_xcb/Makefile.am
View File

@ -28,7 +28,6 @@ evas_engine_gradient.c
module_la_LIBADD = @EINA_LIBS@ @XCBRENDER_LIBS@ $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
module_la_DEPENDENCIES = $(top_builddir)/config.h
include_HEADERS = Evas_Engine_XRender_Xcb.h

1
legacy/evas/src/modules/loaders/edb/Makefile.am
View File

@ -16,6 +16,5 @@ module_la_SOURCES = evas_image_load_edb.c
module_la_LIBADD = @EDB_LIBS@ @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = @lt_no_undefined@ -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
module_la_DEPENDENCIES = $(top_builddir)/config.h
EXTRA_DIST = evas_image_load_edb.c

1
legacy/evas/src/modules/loaders/eet/Makefile.am
View File

@ -20,4 +20,3 @@ module_la_SOURCES = evas_image_load_eet.c
module_la_LIBADD = @EINA_LIBS@ @EET_LIBS@ $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
module_la_DEPENDENCIES = $(top_builddir)/config.h

1
legacy/evas/src/modules/loaders/gif/Makefile.am
View File

@ -19,4 +19,3 @@ module_la_SOURCES = evas_image_load_gif.c
module_la_LIBADD = @EINA_LIBS@ @gif_libs@ $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
module_la_DEPENDENCIES = $(top_builddir)/config.h

1
legacy/evas/src/modules/loaders/jpeg/Makefile.am
View File

@ -20,4 +20,3 @@ module_la_SOURCES = evas_image_load_jpeg.c
module_la_LIBADD = @EINA_LIBS@ @jpeg_libs@ $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
module_la_DEPENDENCIES = $(top_builddir)/config.h

2
legacy/evas/src/modules/loaders/pmaps/Makefile.am
View File

@ -19,6 +19,4 @@ module_la_SOURCES = evas_image_load_pmaps.c
module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
module_la_DEPENDENCIES = $(top_builddir)/config.h

1
legacy/evas/src/modules/loaders/png/Makefile.am
View File

@ -18,4 +18,3 @@ module_la_SOURCES = evas_image_load_png.c
module_la_LIBADD = @EINA_LIBS@ @PNG_LIBS@ $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
module_la_DEPENDENCIES = $(top_builddir)/config.h

1
legacy/evas/src/modules/loaders/svg/Makefile.am
View File

@ -20,4 +20,3 @@ module_la_SOURCES = evas_image_load_svg.c
module_la_LIBADD = @EINA_LIBS@ @svg_libs@ $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
module_la_DEPENDENCIES = $(top_builddir)/config.h

1
legacy/evas/src/modules/loaders/tiff/Makefile.am
View File

@ -20,4 +20,3 @@ module_la_SOURCES = evas_image_load_tiff.c
module_la_LIBADD = @EINA_LIBS@ @tiff_libs@ $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
module_la_DEPENDENCIES = $(top_builddir)/config.h

1
legacy/evas/src/modules/loaders/xpm/Makefile.am
View File

@ -20,4 +20,3 @@ module_la_SOURCES = evas_image_load_xpm.c
module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
module_la_DEPENDENCIES = $(top_builddir)/config.h

1
legacy/evas/src/modules/savers/edb/Makefile.am
View File

@ -16,6 +16,5 @@ module_la_SOURCES = evas_image_save_edb.c
module_la_LIBADD = @EINA_LIBS@ @EDB_LIBS@ $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = @lt_no_undefined@ -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
module_la_DEPENDENCIES = $(top_builddir)/config.h
EXTRA_DIST = evas_image_save_edb.c

1
legacy/evas/src/modules/savers/eet/Makefile.am
View File

@ -20,4 +20,3 @@ module_la_SOURCES = evas_image_save_eet.c
module_la_LIBADD = @EINA_LIBS@ @EET_LIBS@ $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
module_la_DEPENDENCIES = $(top_builddir)/config.h

1
legacy/evas/src/modules/savers/jpeg/Makefile.am
View File

@ -20,4 +20,3 @@ module_la_SOURCES = evas_image_save_jpeg.c
module_la_LIBADD = @EINA_LIBS@ @jpeg_libs@ $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
module_la_DEPENDENCIES = $(top_builddir)/config.h

1
legacy/evas/src/modules/savers/png/Makefile.am
View File

@ -20,4 +20,3 @@ module_la_SOURCES = evas_image_save_png.c
module_la_LIBADD = @EINA_LIBS@ @PNG_LIBS@ $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
module_la_DEPENDENCIES = $(top_builddir)/config.h

1
legacy/evas/src/modules/savers/tiff/Makefile.am
View File

@ -20,4 +20,3 @@ module_la_SOURCES = evas_image_save_tiff.c
module_la_LIBADD = @EINA_LIBS@ @tiff_libs@ $(top_builddir)/src/lib/libevas.la
module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version
module_la_LIBTOOLFLAGS = --tag=disable-static
module_la_DEPENDENCIES = $(top_builddir)/config.h