Enlightenment CVS committal Author : doursse Project : e17 Module : libs/evas
Dir : e17/libs/evas/src/lib Modified Files: Evas.h Makefile.am main.c Log Message: * Remove Windows code in evas_module.c and use evilness instead * Allow Windows Mobile to correctly load dll's * Use correct scheme for EAPI on Windows and include config.h when necessary * add -mwin32 to compiler flags when compiling with cegcc =================================================================== RCS file: /cvs/e/e17/libs/evas/src/lib/Evas.h,v retrieving revision 1.113 retrieving revision 1.114 diff -u -3 -r1.113 -r1.114 --- Evas.h 8 Feb 2008 22:35:19 -0000 1.113 +++ Evas.h 14 Mar 2008 16:49:47 -0000 1.114 @@ -2,14 +2,19 @@ #define _EVAS_H #ifdef EAPI -#undef EAPI +# undef EAPI #endif -#ifdef _MSC_VER -# ifdef BUILDING_DLL -# define EAPI __declspec(dllexport) + +#ifdef _WIN32 +# ifdef EFL_EVAS_BUILD +# ifdef DLL_EXPORT +# define EAPI __declspec(dllexport) +# else +# define EAPI +# endif /* ! DLL_EXPORT */ # else # define EAPI __declspec(dllimport) -# endif +# endif /* ! EFL_EVAS_BUILD */ #else # ifdef __GNUC__ # if __GNUC__ >= 4 @@ -20,7 +25,7 @@ # else # define EAPI # endif -#endif +#endif /* ! _WIN32 */ /** * @file =================================================================== RCS file: /cvs/e/e17/libs/evas/src/lib/Makefile.am,v retrieving revision 1.27 retrieving revision 1.28 diff -u -3 -r1.27 -r1.28 --- Makefile.am 4 Nov 2007 09:21:44 -0000 1.27 +++ Makefile.am 14 Mar 2008 16:49:47 -0000 1.28 @@ -12,6 +12,7 @@ @FREETYPE_CFLAGS@ \ @EET_CFLAGS@ \ @FONTCONFIG_CFLAGS@ \ + @WIN32_CFLAGS@ \ @pthread_cflags@ lib_LTLIBRARIES = libevas.la =================================================================== RCS file: /cvs/e/e17/libs/evas/src/lib/main.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- main.c 11 Jan 2008 07:33:57 -0000 1.18 +++ main.c 14 Mar 2008 16:49:47 -0000 1.19 @@ -1,4 +1,3 @@ -#include "Evas.h" #include "evas_common.h" #include "evas_private.h" ------------------------------------------------------------------------- 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