From: Enlightenment C. <no...@cv...> - 2008-05-26 05:17:08
|
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_imf_evas Modified Files: Ecore_IMF_Evas.h Makefile.am ecore_imf_evas.c 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_imf_evas/Ecore_IMF_Evas.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Ecore_IMF_Evas.h 21 Nov 2007 22:20:16 -0000 1.1 +++ Ecore_IMF_Evas.h 26 May 2008 05:16:33 -0000 1.2 @@ -4,15 +4,23 @@ #ifndef _ECORE_IMF_EVAS_H #define _ECORE_IMF_EVAS_H +#include <Ecore_IMF.h> +#include <Evas.h> + #ifdef EAPI -#undef EAPI +# undef EAPI #endif -#ifdef _MSC_VER -# ifdef BUILDING_DLL -# define EAPI __declspec(dllexport) + +#ifdef _WIN32 +# ifdef EFL_ECORE_IMF_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 @@ -23,10 +31,7 @@ # else # define EAPI # endif -#endif - -#include <Ecore_IMF.h> -#include <Evas.h> +#endif /* ! _WIN32 */ #ifdef __cplusplus extern "C" { =================================================================== RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_imf_evas/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Makefile.am 12 Dec 2007 22:10:58 -0000 1.3 +++ Makefile.am 26 May 2008 05:16:33 -0000 1.4 @@ -20,7 +20,7 @@ libecore_imf_evas_la_DEPENDENCIES = \ $(top_builddir)/src/lib/ecore_imf/libecore_imf.la -libecore_imf_evas_la_LDFLAGS = @create_shared_lib@ -version-info @version_info@ +libecore_imf_evas_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@ endif EXTRA_DIST = \ =================================================================== RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_imf_evas/ecore_imf_evas.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ecore_imf_evas.c 21 Nov 2007 22:20:16 -0000 1.1 +++ ecore_imf_evas.c 26 May 2008 05:16:33 -0000 1.2 @@ -2,7 +2,9 @@ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ -#include "config.h" +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif #include "Ecore_IMF_Evas.h" |