Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_imf
Modified Files:
Ecore_IMF.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_imf/Ecore_IMF.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Ecore_IMF.h 12 Dec 2007 19:00:48 -0000 1.4
+++ Ecore_IMF.h 26 May 2008 05:16:33 -0000 1.5
@@ -1,18 +1,24 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
+
#ifndef _ECORE_IMF_H
#define _ECORE_IMF_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_IMF_BUILD */
#else
# ifdef __GNUC__
# if __GNUC__ >= 4
@@ -23,7 +29,7 @@
# else
# define EAPI
# endif
-#endif
+#endif /* ! _WIN32 */
#include <Ecore_Data.h>
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_imf/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:36 -0000 1.3
+++ Makefile.am 26 May 2008 05:16:33 -0000 1.4
@@ -18,7 +18,7 @@
libecore_imf_la_LIBADD = \
$(top_builddir)/src/lib/ecore/libecore.la
-libecore_imf_la_LDFLAGS = @create_shared_lib@ -version-info @version_info@
+libecore_imf_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@
-version-info @version_info@
endif
EXTRA_DIST = \
-------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
