Enlightenment CVS committal Author : doursse Project : e17 Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_evas Modified Files: Ecore_Evas.h Makefile.am ecore_evas.c ecore_evas_buffer.c ecore_evas_private.h Log Message: integration of evil in ecore. It's compiling on windows and my ubuntu. The commit is big, please report any problem =================================================================== RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_evas/Ecore_Evas.h,v retrieving revision 1.36 retrieving revision 1.37 diff -u -3 -r1.36 -r1.37 --- Ecore_Evas.h 21 Nov 2007 12:16:16 -0000 1.36 +++ Ecore_Evas.h 26 May 2008 05:16:33 -0000 1.37 @@ -1,15 +1,24 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + #ifndef _ECORE_EVAS_H #define _ECORE_EVAS_H #ifdef EAPI -#undef EAPI +# undef EAPI #endif -#ifdef _MSC_VER -# ifdef BUILDING_DLL -# define EAPI __declspec(dllexport) + +#ifdef _WIN32 +# ifdef EFL_ECORE_EVAS_BUILD +# ifdef DLL_EXPORT +# define EAPI __declspec(dllexport) +# else +# define EAPI +# endif /* ! DLL_EXPORT */ # else # define EAPI __declspec(dllimport) -# endif +# endif /* ! EFL_ECORE_EVAS_BUILD */ #else # ifdef __GNUC__ # if __GNUC__ >= 4 @@ -20,7 +29,7 @@ # else # define EAPI # endif -#endif +#endif /* ! _WIN32 */ /** * @file Ecore_Evas.h =================================================================== RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_evas/Makefile.am,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- Makefile.am 23 Jan 2008 23:46:56 -0000 1.20 +++ Makefile.am 26 May 2008 05:16:33 -0000 1.21 @@ -34,7 +34,7 @@ if BUILD_ECORE_SDL ECORE_SDL_INC = -I$(top_srcdir)/src/lib/ecore_sdl @SDL_CFLAGS@ -ECORE_SDL_LIB = $(top_builddir)/src/lib/ecore_sdl/libecore_sdl.la @SDL_LIBS@ +ECORE_SDL_LIB = $(top_builddir)/src/lib/ecore_sdl/libecore_sdl.la else ECORE_SDL_INC = ECORE_SDL_LIB = @@ -78,9 +78,10 @@ $(top_builddir)/src/lib/ecore/libecore.la \ @EVAS_LIBS@ \ @XCB_LIBS@ \ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ \ [EMAIL PROTECTED]@ -libecore_evas_la_LDFLAGS = -version-info @version_info@ +libecore_evas_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@ libecore_evas_la_DEPENDENCIES = \ $(ECORE_X_LIB) \ =================================================================== RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_evas/ecore_evas.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -3 -r1.44 -r1.45 --- ecore_evas.c 19 Nov 2007 18:27:11 -0000 1.44 +++ ecore_evas.c 26 May 2008 05:16:33 -0000 1.45 @@ -1,4 +1,8 @@ -#include "config.h" + +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + #include "Ecore.h" #include "ecore_private.h" #include "ecore_evas_private.h" @@ -1787,7 +1791,6 @@ return NULL; } -#ifndef _WIN32 /* fps debug calls - for debugging how much time your app actually spends */ /* rendering graphics... :) */ @@ -1860,7 +1863,6 @@ *(_ecore_evas_fps_rendertime_mmap) += tm; } } -#endif void _ecore_evas_free(Ecore_Evas *ee) =================================================================== RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_evas/ecore_evas_buffer.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- ecore_evas_buffer.c 11 Jan 2008 07:33:56 -0000 1.19 +++ ecore_evas_buffer.c 26 May 2008 05:16:33 -0000 1.20 @@ -1,4 +1,8 @@ -#include "config.h" + +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + #include "Ecore.h" #include "ecore_private.h" #include "ecore_evas_private.h" @@ -7,9 +11,7 @@ #ifdef BUILD_ECORE_EVAS_BUFFER static int _ecore_evas_init_count = 0; -#ifndef _WIN32 static int _ecore_evas_fps_debug = 0; -#endif /* _WIN32 */ static Ecore_Evas *ecore_evases = NULL; @@ -26,10 +28,8 @@ { _ecore_evas_init_count++; if (_ecore_evas_init_count > 1) return _ecore_evas_init_count; -#ifndef _WIN32 if (getenv("ECORE_EVAS_FPS_DEBUG")) _ecore_evas_fps_debug = 1; if (_ecore_evas_fps_debug) _ecore_evas_fps_debug_init(); -#endif /* _WIN32 */ return _ecore_evas_init_count; } @@ -99,9 +99,7 @@ { _ecore_evas_free((Ecore_Evas *)ecore_evases); } -#ifndef _WIN32 if (_ecore_evas_fps_debug) _ecore_evas_fps_debug_shutdown(); -#endif /* _WIN32 */ } if (_ecore_evas_init_count < 0) _ecore_evas_init_count = 0; return _ecore_evas_init_count; =================================================================== RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_evas/ecore_evas_private.h,v retrieving revision 1.39 retrieving revision 1.40 diff -u -3 -r1.39 -r1.40 --- ecore_evas_private.h 26 Jan 2008 05:40:52 -0000 1.39 +++ ecore_evas_private.h 26 May 2008 05:16:33 -0000 1.40 @@ -290,6 +290,9 @@ #ifdef BUILD_ECORE_EVAS_DIRECTFB int _ecore_evas_directfb_shutdown(void); #endif +#ifdef BUILD_ECORE_WIN32 +int _ecore_evas_win32_shutdown(void); +#endif void _ecore_evas_fps_debug_init(void); void _ecore_evas_fps_debug_shutdown(void); ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs