summaryrefslogtreecommitdiff
path: root/src/lib/ecore_cocoa
diff options
context:
space:
mode:
authorJean Guyomarc'h <jean.guyomarch@gmail.com>2015-05-10 22:58:11 +0200
committerCedric BAIL <cedric@osg.samsung.com>2015-05-10 22:58:14 +0200
commit3a3b12d40348eec715327abfe78b34c7fbaeb6cc (patch)
tree915225a1ca090be5819d99f7c6764f7f66eddbab /src/lib/ecore_cocoa
parentb85713a0a494a1db778a24dc01b0a6dcdc00e4bc (diff)
ecore_cocoa,ethumb: fix compiling after EAPI policy changes
Summary: I went through a lot of undefined symbols while compiling ecore_evas_cocoa module and ethumb-related binaries. E.g.: Undefined symbols for architecture x86_64: "_ECORE_COCOA_EVENT_EXPOSE", referenced from: _ecore_evas_cocoa_new_internal in modules_ecore_evas_engines_cocoa_module_la-ecore_evas_cocoa.o "_ECORE_COCOA_EVENT_GOT_FOCUS", referenced from: _ecore_evas_cocoa_new_internal in modules_ecore_evas_engines_cocoa_module_la-ecore_evas_cocoa.o "_ECORE_COCOA_EVENT_LOST_FOCUS", referenced from: _ecore_evas_cocoa_new_internal in modules_ecore_evas_engines_cocoa_module_la-ecore_evas_cocoa.o "_ECORE_COCOA_EVENT_RESIZE", referenced from: _ecore_evas_cocoa_new_internal in modules_ecore_evas_engines_cocoa_module_la-ecore_evas_cocoa.o "_ECORE_COCOA_EVENT_WINDOW_DESTROY", referenced from: _ecore_evas_cocoa_new_internal in modules_ecore_evas_engines_cocoa_module_la-ecore_evas_cocoa.o "_ecore_cocoa_init", referenced from: _ecore_evas_cocoa_new_internal in modules_ecore_evas_engines_cocoa_module_la-ecore_evas_cocoa.o "_ecore_cocoa_screen_size_get", referenced from: __ecore_evas_screen_geometry_get in modules_ecore_evas_engines_cocoa_module_la-ecore_evas_cocoa.o "_ecore_cocoa_shutdown", referenced from: _ecore_evas_cocoa_new_internal in modules_ecore_evas_engines_cocoa_module_la-ecore_evas_cocoa.o __ecore_evas_cocoa_free in modules_ecore_evas_engines_cocoa_module_la-ecore_evas_cocoa.o Undefined symbols for architecture x86_64: "_ethumb_calculate_aspect_from_ratio", referenced from: __resize_movie in modules_ethumb_emotion_module_la-emotion.o "_ethumb_calculate_fill_from_ratio", referenced from: __resize_movie in modules_ethumb_emotion_module_la-emotion.o "_ethumb_ecore_evas_get", referenced from: __frame_decode_cb in modules_ethumb_emotion_module_la-emotion.o "_ethumb_evas_get", referenced from: __thumb_generate in modules_ethumb_emotion_module_la-emotion.o __finish_thumb_generation in modules_ethumb_emotion_module_la-emotion.o "_ethumb_finished_callback_call", referenced from: __thumb_generate in modules_ethumb_emotion_module_la-emotion.o __frame_decode_cb in modules_ethumb_emotion_module_la-emotion.o __finish_thumb_generation in modules_ethumb_emotion_module_la-emotion.o "_ethumb_image_save", referenced from: __frame_decode_cb in modules_ethumb_emotion_module_la-emotion.o "_ethumb_plugin_image_resize", referenced from: __resize_movie in modules_ethumb_emotion_module_la-emotion.o "_ethumb_plugin_register", referenced from: __module_init in modules_ethumb_emotion_module_la-emotion.o "_ethumb_plugin_unregister", referenced from: __module_shutdown in modules_ethumb_emotion_module_la-emotion.o EAPI was not well re-defined in both cases. It has been handled in ecore_cocoa_private.h and ethumb_private.h. These files must be included after a main library header (because EAPI is undef there). Reviewers: cedric Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D2483 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
Diffstat (limited to 'src/lib/ecore_cocoa')
-rw-r--r--src/lib/ecore_cocoa/ecore_cocoa.m3
-rw-r--r--src/lib/ecore_cocoa/ecore_cocoa_app.m2
-rw-r--r--src/lib/ecore_cocoa/ecore_cocoa_private.h26
-rw-r--r--src/lib/ecore_cocoa/ecore_cocoa_window.m5
4 files changed, 31 insertions, 5 deletions
diff --git a/src/lib/ecore_cocoa/ecore_cocoa.m b/src/lib/ecore_cocoa/ecore_cocoa.m
index 64eda41fbd..bdc5cf0110 100644
--- a/src/lib/ecore_cocoa/ecore_cocoa.m
+++ b/src/lib/ecore_cocoa/ecore_cocoa.m
@@ -9,12 +9,11 @@
9#include <Eina.h> 9#include <Eina.h>
10 10
11#include <Ecore.h> 11#include <Ecore.h>
12#include <ecore_cocoa_private.h>
13#include <Ecore_Input.h> 12#include <Ecore_Input.h>
14 13
15#include "Ecore_Cocoa.h" 14#include "Ecore_Cocoa.h"
16#include "Ecore_Cocoa_Keys.h" 15#include "Ecore_Cocoa_Keys.h"
17 16#include "ecore_cocoa_private.h"
18 17
19EAPI int ECORE_COCOA_EVENT_GOT_FOCUS = 0; 18EAPI int ECORE_COCOA_EVENT_GOT_FOCUS = 0;
20EAPI int ECORE_COCOA_EVENT_LOST_FOCUS = 0; 19EAPI int ECORE_COCOA_EVENT_LOST_FOCUS = 0;
diff --git a/src/lib/ecore_cocoa/ecore_cocoa_app.m b/src/lib/ecore_cocoa/ecore_cocoa_app.m
index 5ee349c8aa..d05070a586 100644
--- a/src/lib/ecore_cocoa/ecore_cocoa_app.m
+++ b/src/lib/ecore_cocoa/ecore_cocoa_app.m
@@ -1,4 +1,6 @@
1#import "ecore_cocoa_app.h" 1#import "ecore_cocoa_app.h"
2#import "ecore_cocoa_window.h"
3#include "ecore_cocoa_private.h"
2 4
3static Eina_Bool 5static Eina_Bool
4_ecore_cocoa_run_loop_cb(void *data EINA_UNUSED) 6_ecore_cocoa_run_loop_cb(void *data EINA_UNUSED)
diff --git a/src/lib/ecore_cocoa/ecore_cocoa_private.h b/src/lib/ecore_cocoa/ecore_cocoa_private.h
index 9127de15c6..ffe48ab074 100644
--- a/src/lib/ecore_cocoa/ecore_cocoa_private.h
+++ b/src/lib/ecore_cocoa/ecore_cocoa_private.h
@@ -1,7 +1,31 @@
1#ifndef _ECORE_COCOA_PRIVATE_H 1#ifndef _ECORE_COCOA_PRIVATE_H
2#define _ECORE_COCOA_PRIVATE_H 2#define _ECORE_COCOA_PRIVATE_H
3 3
4#include "ecore_cocoa_window.h" 4#ifdef EAPI
5# undef EAPI
6#endif
7
8#ifdef _WIN32
9# ifdef EFL_ECORE_BUILD
10# ifdef DLL_EXPORT
11# define EAPI __declspec(dllexport)
12# else
13# define EAPI
14# endif /* ! DLL_EXPORT */
15# else
16# define EAPI __declspec(dllimport)
17# endif /* ! EFL_ECORE_BUILD */
18#else
19# ifdef __GNUC__
20# if __GNUC__ >= 4
21# define EAPI __attribute__ ((visibility("default")))
22# else
23# define EAPI
24# endif
25# else
26# define EAPI
27# endif
28#endif /* ! _WIN32 */
5 29
6extern int _ecore_cocoa_log_domain; 30extern int _ecore_cocoa_log_domain;
7 31
diff --git a/src/lib/ecore_cocoa/ecore_cocoa_window.m b/src/lib/ecore_cocoa/ecore_cocoa_window.m
index eabc65fdde..2fd4bab189 100644
--- a/src/lib/ecore_cocoa/ecore_cocoa_window.m
+++ b/src/lib/ecore_cocoa/ecore_cocoa_window.m
@@ -2,11 +2,12 @@
2# include <config.h> 2# include <config.h>
3#endif 3#endif
4 4
5#include <Ecore_Input.h>
6
5#include <Ecore.h> 7#include <Ecore.h>
6#include <Ecore_Cocoa.h> 8#include <Ecore_Cocoa.h>
7#include "ecore_cocoa_private.h"
8#import "ecore_cocoa_window.h" 9#import "ecore_cocoa_window.h"
9#include <Ecore_Input.h> 10#include "ecore_cocoa_private.h"
10 11
11@implementation EcoreCocoaWindow 12@implementation EcoreCocoaWindow
12 13