Enlightenment CVS committal Author : doursse Project : e17 Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_sdl Modified Files: Ecore_Sdl.h Makefile.am 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_sdl/Ecore_Sdl.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Ecore_Sdl.h 16 Apr 2008 08:36:08 -0000 1.2 +++ Ecore_Sdl.h 26 May 2008 05:16:34 -0000 1.3 @@ -1,15 +1,24 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ + #ifndef _ECORE_SDL_H #define _ECORE_SDL_H #ifdef EAPI -#undef EAPI +# undef EAPI #endif -#ifdef _MSC_VER -# ifdef BUILDING_DLL -# define EAPI __declspec(dllexport) + +#ifdef _WIN32 +# ifdef EFL_ECORE_SDL_BUILD +# ifdef DLL_EXPORT +# define EAPI __declspec(dllexport) +# else +# define EAPI +# endif /* ! DLL_EXPORT */ # else # define EAPI __declspec(dllimport) -# endif +# endif /* ! EFL_ECORE_SDL_BUILD */ #else # ifdef __GNUC__ # if __GNUC__ >= 4 @@ -20,15 +29,17 @@ # else # define EAPI # endif -#endif +#endif /* ! _WIN32 */ /** * @file * @brief Ecore SDL system functions. */ + #ifdef __cplusplus extern "C" { #endif + EAPI extern int ECORE_SDL_EVENT_KEY_DOWN; /**< SDL Key Down event */ EAPI extern int ECORE_SDL_EVENT_KEY_UP; /**< SDL Key Up event */ EAPI extern int ECORE_SDL_EVENT_MOUSE_BUTTON_DOWN; /**< SDL Mouse Down event */ =================================================================== RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_sdl/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- Makefile.am 4 Nov 2007 19:15:29 -0000 1.4 +++ Makefile.am 26 May 2008 05:16:34 -0000 1.5 @@ -17,9 +17,9 @@ libecore_sdl_la_LIBADD = \ $(top_builddir)/src/lib/ecore/libecore.la \ [EMAIL PROTECTED]@ @create_shared_lib@ [EMAIL PROTECTED]@ -libecore_sdl_la_LDFLAGS = -version-info @version_info@ +libecore_sdl_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@ libecore_sdl_la_DEPENDENCIES = \ $(top_builddir)/src/lib/ecore/libecore.la ------------------------------------------------------------------------- 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