summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVyacheslav Reutskiy <v.reutskiy@samsung.com>2014-07-30 16:18:07 +0300
committerVyacheslav Reutskiy <v.reutskiy@samsung.com>2014-07-31 15:29:26 +0300
commit2a004811fa678a7829e372e2e6687f3037982436 (patch)
treee6adcbf9b6426a06fb7f99d66a0b863fbb8e6335
parent596982ae79aa4c696dcd802014efd10c8c3f91ed (diff)
Define the EAPI
Patch sent Vincent Torri <vincent.torri@gmail.com>
-rw-r--r--src/lib/Ewe.h34
-rw-r--r--src/lib/Makefile.am1
-rw-r--r--src/lib/ewe_entry.c1
-rw-r--r--src/lib/ewe_main.h8
-rw-r--r--src/lib/ewe_widget_entry.h1
5 files changed, 36 insertions, 9 deletions
diff --git a/src/lib/Ewe.h b/src/lib/Ewe.h
index 93d2c19..6c6df34 100644
--- a/src/lib/Ewe.h
+++ b/src/lib/Ewe.h
@@ -19,6 +19,40 @@
19#ifndef ELEMENTARY_WIDGET_EXTENSIONS_H 19#ifndef ELEMENTARY_WIDGET_EXTENSIONS_H
20#define ELEMENTARY_WIDGET_EXTENSIONS_H 20#define ELEMENTARY_WIDGET_EXTENSIONS_H
21 21
22#include <Elementary.h>
23
24#ifdef EAPI
25# undef EAPI
26#endif
27
28#ifdef _WIN32
29# ifdef EWE_BUILD
30# ifdef DLL_EXPORT
31# define EAPI __declspec(dllexport)
32# else
33# define EAPI
34# endif
35# else
36# define EAPI __declspec(dllimport)
37# endif
38#else
39# ifdef __GNUC__
40# if __GNUC__ >= 4
41# define EAPI __attribute__ ((visibility("default")))
42# else
43# define EAPI
44# endif
45# else
46# define EAPI
47# endif
48#endif
49
22#include "ewe_main.h" 50#include "ewe_main.h"
51#include "ewe_statusbar.h"
52#include "ewe_combobox.h"
53#include "ewe_ruler.h"
54#include "ewe_entry.h"
55#include "ewe_tabs.h"
56#include "ewe_win.h"
23 57
24#endif /* ELEMENTARY_WIDGET_EXTENTIONS */ 58#endif /* ELEMENTARY_WIDGET_EXTENTIONS */
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index cfa3380..c0b4883 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -20,6 +20,7 @@ AM_CPPFLAGS = \
20-DEFL_EO_API_SUPPORT \ 20-DEFL_EO_API_SUPPORT \
21-DEFL_BETA_API_SUPPORT \ 21-DEFL_BETA_API_SUPPORT \
22-DELM_INTERNAL_API_ARGESFSDFEFC \ 22-DELM_INTERNAL_API_ARGESFSDFEFC \
23-DEWE_BUILD \
23@ELEMENTARY_CFLAGS@ 24@ELEMENTARY_CFLAGS@
24 25
25lib_LTLIBRARIES = libewe.la 26lib_LTLIBRARIES = libewe.la
diff --git a/src/lib/ewe_entry.c b/src/lib/ewe_entry.c
index 3e5c83f..3e48ab2 100644
--- a/src/lib/ewe_entry.c
+++ b/src/lib/ewe_entry.c
@@ -1,5 +1,6 @@
1#include "ewe_private.h" 1#include "ewe_private.h"
2#include "ewe_widget_entry.h" 2#include "ewe_widget_entry.h"
3#include "Ewe.h"
3 4
4#define MY_CLASS EWE_ENTRY_CLASS 5#define MY_CLASS EWE_ENTRY_CLASS
5 6
diff --git a/src/lib/ewe_main.h b/src/lib/ewe_main.h
index 15fdb98..4358583 100644
--- a/src/lib/ewe_main.h
+++ b/src/lib/ewe_main.h
@@ -19,14 +19,6 @@
19#ifndef EWE_MAIN_H 19#ifndef EWE_MAIN_H
20#define EWE_MAIN_H 20#define EWE_MAIN_H
21 21
22#include <Elementary.h>
23#include "ewe_statusbar.h"
24#include "ewe_combobox.h"
25#include "ewe_ruler.h"
26#include "ewe_entry.h"
27#include "ewe_tabs.h"
28#include "ewe_win.h"
29
30/** 22/**
31 * Initialize Elementary Widget Extensions library 23 * Initialize Elementary Widget Extensions library
32 * 24 *
diff --git a/src/lib/ewe_widget_entry.h b/src/lib/ewe_widget_entry.h
index db9cca5..69f9c7b 100644
--- a/src/lib/ewe_widget_entry.h
+++ b/src/lib/ewe_widget_entry.h
@@ -3,7 +3,6 @@
3 3
4#include <regex.h> 4#include <regex.h>
5#include <elm_widget_entry.h> 5#include <elm_widget_entry.h>
6#include "ewe_main.h"
7 6
8typedef struct _Ewe_Entry_Data Ewe_Entry_Data; 7typedef struct _Ewe_Entry_Data Ewe_Entry_Data;
9struct _Ewe_Entry_Data { 8struct _Ewe_Entry_Data {