summaryrefslogtreecommitdiff
path: root/legacy/ethumb
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2009-11-06 18:27:56 +0000
committerVincent Torri <vincent.torri@gmail.com>2009-11-06 18:27:56 +0000
commit4d7149ffb100ebfda408d19c48a57ee2bfc4f11a (patch)
tree5e66241c12757064a8354254c2cbb6145489c4bc /legacy/ethumb
parentf65022c0776f7d3ab7a0cfea1040918cbcc9b912 (diff)
fix DLL creation on Windows
SVN revision: 43495
Diffstat (limited to 'legacy/ethumb')
-rw-r--r--legacy/ethumb/src/lib/Ethumb.h2
-rw-r--r--legacy/ethumb/src/lib/client/Ethumb_Client.c16
-rw-r--r--legacy/ethumb/src/lib/client/Ethumb_Client.h14
-rw-r--r--legacy/ethumb/src/lib/client/Makefile.am5
4 files changed, 20 insertions, 17 deletions
diff --git a/legacy/ethumb/src/lib/Ethumb.h b/legacy/ethumb/src/lib/Ethumb.h
index a95ed9b6da..8e5ae1477e 100644
--- a/legacy/ethumb/src/lib/Ethumb.h
+++ b/legacy/ethumb/src/lib/Ethumb.h
@@ -10,7 +10,6 @@
10# undef EAPI 10# undef EAPI
11#endif 11#endif
12 12
13#ifndef EAPI
14#ifdef _WIN32 13#ifdef _WIN32
15# ifdef EFL_ETHUMB_BUILD 14# ifdef EFL_ETHUMB_BUILD
16# ifdef DLL_EXPORT 15# ifdef DLL_EXPORT
@@ -38,7 +37,6 @@
38# define GNUC_NULL_TERMINATED 37# define GNUC_NULL_TERMINATED
39# endif 38# endif
40#endif /* ! _WIN32 */ 39#endif /* ! _WIN32 */
41#endif /* EAPI */
42 40
43#ifdef __cplusplus 41#ifdef __cplusplus
44extern "C" { 42extern "C" {
diff --git a/legacy/ethumb/src/lib/client/Ethumb_Client.c b/legacy/ethumb/src/lib/client/Ethumb_Client.c
index a9d2905634..0cfd046411 100644
--- a/legacy/ethumb/src/lib/client/Ethumb_Client.c
+++ b/legacy/ethumb/src/lib/client/Ethumb_Client.c
@@ -63,12 +63,9 @@
63 */ 63 */
64 64
65#ifdef HAVE_CONFIG_H 65#ifdef HAVE_CONFIG_H
66#include "config.h" 66# include "config.h"
67#endif 67#endif
68#include <Eina.h> 68
69#include <eina_safety_checks.h>
70#include <Ethumb.h>
71#include "Ethumb_Client.h"
72#include <stdio.h> 69#include <stdio.h>
73#include <stdlib.h> 70#include <stdlib.h>
74#include <limits.h> 71#include <limits.h>
@@ -78,12 +75,17 @@
78#include <sys/types.h> 75#include <sys/types.h>
79#include <stdbool.h> 76#include <stdbool.h>
80 77
78#include <Eina.h>
79#include <eina_safety_checks.h>
80#include <E_DBus.h>
81#include <Ethumb.h>
82
83#include "Ethumb_Client.h"
84
81#ifndef PATH_MAX 85#ifndef PATH_MAX
82#define PATH_MAX 4096 86#define PATH_MAX 4096
83#endif 87#endif
84 88
85#include <E_DBus.h>
86
87#define MAX_ID 2000000 89#define MAX_ID 2000000
88 90
89static int _log_dom = -1; 91static int _log_dom = -1;
diff --git a/legacy/ethumb/src/lib/client/Ethumb_Client.h b/legacy/ethumb/src/lib/client/Ethumb_Client.h
index fbecbeca70..81d04e1d20 100644
--- a/legacy/ethumb/src/lib/client/Ethumb_Client.h
+++ b/legacy/ethumb/src/lib/client/Ethumb_Client.h
@@ -1,9 +1,14 @@
1#ifndef __ETHUMB_CLIENT_H__ 1#ifndef __ETHUMB_CLIENT_H__
2#define __ETHUMB_CLIENT_H__ 1 2#define __ETHUMB_CLIENT_H__ 1
3 3
4#ifndef EAPI 4#include <Ethumb.h>
5
6#ifdef EAPI
7# undef EAPI
8#endif
9
5#ifdef _WIN32 10#ifdef _WIN32
6# ifdef EFL_EVAS_BUILD 11# ifdef EFL_ETHUMB_CLIENT_BUILD
7# ifdef DLL_EXPORT 12# ifdef DLL_EXPORT
8# define EAPI __declspec(dllexport) 13# define EAPI __declspec(dllexport)
9# define GNUC_NULL_TERMINATED 14# define GNUC_NULL_TERMINATED
@@ -14,7 +19,7 @@
14# else 19# else
15# define EAPI __declspec(dllimport) 20# define EAPI __declspec(dllimport)
16# define GNUC_NULL_TERMINATED 21# define GNUC_NULL_TERMINATED
17# endif /* ! EFL_EVAS_BUILD */ 22# endif /* ! EFL_ETHUMB_BUILD */
18#else 23#else
19# ifdef __GNUC__ 24# ifdef __GNUC__
20# if __GNUC__ >= 4 25# if __GNUC__ >= 4
@@ -29,9 +34,6 @@
29# define GNUC_NULL_TERMINATED 34# define GNUC_NULL_TERMINATED
30# endif 35# endif
31#endif /* ! _WIN32 */ 36#endif /* ! _WIN32 */
32#endif /* EAPI */
33
34#include <Ethumb.h>
35 37
36#ifdef __cplusplus 38#ifdef __cplusplus
37extern "C" { 39extern "C" {
diff --git a/legacy/ethumb/src/lib/client/Makefile.am b/legacy/ethumb/src/lib/client/Makefile.am
index 542d347958..e5bbea1932 100644
--- a/legacy/ethumb/src/lib/client/Makefile.am
+++ b/legacy/ethumb/src/lib/client/Makefile.am
@@ -4,7 +4,8 @@ AM_CPPFLAGS = \
4 -I$(top_srcdir) \ 4 -I$(top_srcdir) \
5 -I$(top_builddir) \ 5 -I$(top_builddir) \
6 -I$(top_srcdir)/src/lib \ 6 -I$(top_srcdir)/src/lib \
7 @EDBUS_CFLAGS@ 7 @EDBUS_CFLAGS@ \
8 @EFL_ETHUMB_CLIENT_BUILD@
8 9
9include_HEADERS = Ethumb_Client.h 10include_HEADERS = Ethumb_Client.h
10 11
@@ -16,6 +17,6 @@ libethumb_client_la_DEPENDENCIES = $(top_builddir)/config.h
16libethumb_client_la_LIBADD = \ 17libethumb_client_la_LIBADD = \
17 $(top_builddir)/src/lib/libethumb.la \ 18 $(top_builddir)/src/lib/libethumb.la \
18 @EDBUS_LIBS@ 19 @EDBUS_LIBS@
19libethumb_client_la_LDFLAGS = -version-info @version_info@ 20libethumb_client_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
20 21
21# @EVAS_LIBS@ @ECORE_EVAS_LIBS@ @ECORE_FILE_LIBS@ @EDJE_LIBS@ 22# @EVAS_LIBS@ @ECORE_EVAS_LIBS@ @ECORE_FILE_LIBS@ @EDJE_LIBS@