Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_txt
Modified Files:
Ecore_Txt.h Makefile.am ecore_txt.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_txt/Ecore_Txt.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- Ecore_Txt.h 15 Mar 2007 22:21:28 -0000 1.8
+++ Ecore_Txt.h 26 May 2008 05:16:34 -0000 1.9
@@ -1,15 +1,24 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#ifndef _ECORE_TXT_H
#define _ECORE_TXT_H
#ifdef EAPI
-#undef EAPI
+# undef EAPI
#endif
-#ifdef _MSC_VER
-# ifdef BUILDING_DLL
-# define EAPI __declspec(dllexport)
+
+#ifdef _WIN32
+# ifdef EFL_ECORE_TXT_BUILD
+# ifdef DLL_EXPORT
+# define EAPI __declspec(dllexport)
+# else
+# define EAPI
+# endif /* ! DLL_EXPORT */
# else
# define EAPI __declspec(dllimport)
-# endif
+# endif /* ! EFL_ECORE_TXT_BUILD */
#else
# ifdef __GNUC__
# if __GNUC__ >= 4
@@ -20,7 +29,7 @@
# else
# define EAPI
# endif
-#endif
+#endif /* ! _WIN32 */
/**
* @file Ecore_Txt.h
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_txt/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Makefile.am 4 Nov 2007 09:29:20 -0000 1.7
+++ Makefile.am 26 May 2008 05:16:34 -0000 1.8
@@ -18,7 +18,7 @@
libecore_txt_la_LIBADD = @iconv_libs@
-libecore_txt_la_LDFLAGS = @create_shared_lib@ -version-info @version_info@
+libecore_txt_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@
-version-info @version_info@
libecore_txt_la_DEPENDENCIES =
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_txt/ecore_txt.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ecore_txt.c 28 Sep 2006 20:44:33 -0000 1.10
+++ ecore_txt.c 26 May 2008 05:16:34 -0000 1.11
@@ -1,5 +1,7 @@
-#include "ecore_txt_private.h"
-#include "Ecore_Txt.h"
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
#include <iconv.h>
#include <errno.h>
@@ -7,6 +9,10 @@
#include <stdio.h>
#include <unistd.h>
#include <string.h>
+
+#include "Ecore_Txt.h"
+#include "ecore_txt_private.h"
+
/**
* To be documented.
-------------------------------------------------------------------------
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
