Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/esmart
Dir : e17/libs/esmart/src/lib/esmart_container
Modified Files:
Esmart_Container.h Makefile.am esmart_container.c
esmart_container_element.c esmart_container_plugin.c
esmart_container_private.h esmart_container_smart.c
esmart_container_util.c
Log Message:
make (some parts of) esmart working on Windows
===================================================================
RCS file: /cvs/e/e17/libs/esmart/src/lib/esmart_container/Esmart_Container.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- Esmart_Container.h 15 Aug 2007 21:18:21 -0000 1.10
+++ Esmart_Container.h 12 Jul 2008 06:40:36 -0000 1.11
@@ -1,15 +1,22 @@
#ifndef ESMART_CONTAINER_H
#define ESMART_CONTAINER_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_CONTAINER_BUILD
+# ifdef DLL_EXPORT
+# define EAPI __declspec(dllexport)
+# else
+# define EAPI
+# endif /* ! DLL_EXPORT */
# else
# define EAPI __declspec(dllimport)
-# endif
+# endif /* ! EFL_ESMART_CONTAINER_BUILD */
#else
# ifdef __GNUC__
# if __GNUC__ >= 4
@@ -21,8 +28,6 @@
# define EAPI
# endif
#endif
-
-#include <Evas.h>
/*****
Todo:
===================================================================
RCS file: /cvs/e/e17/libs/esmart/src/lib/esmart_container/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- Makefile.am 5 Jul 2008 14:15:25 -0000 1.13
+++ Makefile.am 12 Jul 2008 06:40:36 -0000 1.14
@@ -23,5 +23,5 @@
esmart_container_smart.c \
esmart_container_util.c
-libesmart_container_la_LDFLAGS = -version-info @version_info@
-libesmart_container_la_LIBADD = -lltdl -lm @CONTAINER_LIBS@
+libesmart_container_la_LDFLAGS = -no-undefined -version-info @version_info@
+libesmart_container_la_LIBADD = @CONTAINER_LIBS@ -lltdl -lm
===================================================================
RCS file: /cvs/e/e17/libs/esmart/src/lib/esmart_container/esmart_container.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- esmart_container.c 6 Sep 2006 07:17:48 -0000 1.15
+++ esmart_container.c 12 Jul 2008 06:40:36 -0000 1.16
@@ -6,8 +6,15 @@
*
***************************************************************************/
-#include <Evas.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdlib.h>
#include <math.h>
+
+#include <Ecore.h>
+
#include "Esmart_Container.h"
#include "esmart_container_private.h"
===================================================================
RCS file:
/cvs/e/e17/libs/esmart/src/lib/esmart_container/esmart_container_element.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- esmart_container_element.c 6 Sep 2006 07:17:48 -0000 1.4
+++ esmart_container_element.c 12 Jul 2008 06:40:36 -0000 1.5
@@ -1,3 +1,11 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdlib.h>
+
+#include <Ecore.h>
+
#include "Esmart_Container.h"
#include "esmart_container_private.h"
===================================================================
RCS file:
/cvs/e/e17/libs/esmart/src/lib/esmart_container/esmart_container_plugin.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- esmart_container_plugin.c 5 May 2004 05:57:00 -0000 1.1.1.1
+++ esmart_container_plugin.c 12 Jul 2008 06:40:36 -0000 1.2
@@ -1,12 +1,17 @@
/* plugin code taken from eplayer and modified */
-#include <Evas.h>
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <stdlib.h>
-#include <ltdl.h>
#include <stdio.h>
#include <string.h>
#include <limits.h>
+#include <ltdl.h>
+
+#include <Ecore.h>
+
#include "Esmart_Container.h"
#include "esmart_container_private.h"
@@ -20,7 +25,11 @@
return NULL;
for (l = files; l; l = l->next) {
+#ifdef _WIN32
+ sscanf((char *)l->data, "%127[^.].dll", tmp);
+#else
sscanf((char *)l->data, "%127[^.].so", tmp);
+#endif /* ! _WIN32 */
if (!strcasecmp(name, tmp)) {
ret = strdup(l->data);
@@ -59,7 +68,11 @@
memset(p, 0, sizeof(Container_Layout_Plugin));
- snprintf(path, sizeof(path), "%s/%s.so", CONTAINER_PLUGIN_DIR, name);
+#ifdef _WIN32
+ snprintf(path, sizeof(path), "%s/%s.dll", CONTAINER_PLUGIN_DIR, name);
+#else
+ snprintf(path, sizeof(path), "%s/%s.so", CONTAINER_PLUGIN_DIR, name);
+#endif /* ! _WIN32 */
if ((numerr = lt_dlinit()))
{
===================================================================
RCS file:
/cvs/e/e17/libs/esmart/src/lib/esmart_container/esmart_container_private.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- esmart_container_private.h 2 Jan 2006 00:34:18 -0000 1.6
+++ esmart_container_private.h 12 Jul 2008 06:40:36 -0000 1.7
@@ -1,14 +1,6 @@
#ifndef CONTAINER_PRIVATE_H
#define CONTAINER_PRIVATE_H
-#include "Esmart_Container.h"
-#include <Ecore.h>
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <dirent.h>
-
typedef struct _Container Container;
typedef struct _Container_Element Container_Element;
typedef struct _Scroll_Data Scroll_Data;
===================================================================
RCS file:
/cvs/e/e17/libs/esmart/src/lib/esmart_container/esmart_container_smart.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- esmart_container_smart.c 4 Aug 2007 14:50:40 -0000 1.6
+++ esmart_container_smart.c 12 Jul 2008 06:40:36 -0000 1.7
@@ -1,6 +1,16 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <Ecore.h>
+
#include "Esmart_Container.h"
#include "esmart_container_private.h"
===================================================================
RCS file:
/cvs/e/e17/libs/esmart/src/lib/esmart_container/esmart_container_util.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- esmart_container_util.c 8 Jan 2005 15:08:00 -0000 1.2
+++ esmart_container_util.c 12 Jul 2008 06:40:36 -0000 1.3
@@ -1,4 +1,14 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <dirent.h>
#include <sys/stat.h>
+
+#include <Ecore.h>
+
#include "Esmart_Container.h"
#include "esmart_container_private.h"
-------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
