Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/esmart
Dir : e17/libs/esmart/src/lib/esmart_text_entry
Modified Files:
Esmart_Text_Entry.h Makefile.am esmart_text_entry.c
Log Message:
make (some parts of) esmart working on Windows
===================================================================
RCS file: /cvs/e/e17/libs/esmart/src/lib/esmart_text_entry/Esmart_Text_Entry.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- Esmart_Text_Entry.h 17 Dec 2007 03:21:19 -0000 1.9
+++ Esmart_Text_Entry.h 12 Jul 2008 06:40:37 -0000 1.10
@@ -1,15 +1,22 @@
#ifndef _ESMART_TEXT_ENTRY_H
#define _ESMART_TEXT_ENTRY_H
+#include <Evas.h>
+
#ifdef EAPI
-#undef EAPI
+# undef EAPI
#endif
-#ifdef WIN32
-# ifdef BUILDING_DLL
-# define EAPI __declspec(dllexport)
+
+#ifdef _WIN32
+# ifdef EFL_ESMART_TEXT_ENTRY_BUILD
+# ifdef DLL_EXPORT
+# define EAPI __declspec(dllexport)
+# else
+# define EAPI
+# endif /* ! DLL_EXPORT */
# else
# define EAPI __declspec(dllimport)
-# endif
+# endif /* ! EFL_ESMART_TEXT_ENTRY_BUILD */
#else
# ifdef __GNUC__
# if __GNUC__ >= 4
@@ -21,8 +28,6 @@
# define EAPI
# endif
#endif
-
-#include <Evas.h>
#ifdef __cplusplus
extern "C" {
===================================================================
RCS file: /cvs/e/e17/libs/esmart/src/lib/esmart_text_entry/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- Makefile.am 11 Nov 2007 11:05:07 -0000 1.9
+++ Makefile.am 12 Jul 2008 06:40:37 -0000 1.10
@@ -15,6 +15,6 @@
esmart_text_entry.c \
Esmart_Text_Entry.h
-libesmart_text_entry_la_LDFLAGS = -version-info @version_info@
+libesmart_text_entry_la_LDFLAGS = -no-undefined -version-info @version_info@
libesmart_text_entry_la_LIBADD = @TEXT_ENTRY_LIBS@
===================================================================
RCS file: /cvs/e/e17/libs/esmart/src/lib/esmart_text_entry/esmart_text_entry.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- esmart_text_entry.c 6 Sep 2006 07:17:48 -0000 1.13
+++ esmart_text_entry.c 12 Jul 2008 06:40:37 -0000 1.14
@@ -2,12 +2,16 @@
* vim:ts=8:sw=3
*/
-#include <stdio.h>
-#include <string.h>
-#include <Ecore.h>
-#include <Edje.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <stdlib.h>
#include <limits.h>
+
+#include <Ecore.h>
+#include <Edje.h>
+
#include "Esmart_Text_Entry.h"
struct _Esmart_Text_Entry
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
