clean up code for supporting dllexport in win32.

2015-02-28 15:13:23 +09:00 · 2015-02-28 15:13:23 +09:00 · cdab9f0a5d
parent 96d4919a6b
commit cdab9f0a5d
17 changed files with 3 additions and 26 deletions
--- a/configure.ac
+++ b/configure.ac
@ -58,6 +58,7 @@ EFL_ENABLE_EO_API_SUPPORT
 EFL_ENABLE_BETA_API_SUPPORT
 ENVENTOR_ENABLE_BETA_API_SUPPORT
 EFL_ENABLE_EO_LATEST
+AC_DEFINE_UNQUOTED(ENVENTOR_WIN32_BUILD_SUPPORT, 1, "Support Win32 dllexport")

 efl_version="1.13.0"
 requirement_enventor=" \
--- a/src/lib/Enventor_Eo.h
+++ b/src/lib/Enventor_Eo.h
@ -8,7 +8,7 @@
 # ifdef EOAPI
 #  undef EOAPI
 # endif
-# ifdef ENVENTOR_BUILD
+# ifdef ENVENTOR_WIN32_BUILD_SUPPORT
 #  define EAPI __declspec(dllexport)
 #  define EOAPI __declspec(dllexport)
 # else
--- a/src/lib/Enventor_Legacy.h
+++ b/src/lib/Enventor_Legacy.h
@ -5,7 +5,7 @@
 # ifdef EAPI
 #  undef EAPI
 # endif
-# ifdef ENVENTOR_BUILD
+# ifdef ENVENTOR_WIN32_BUILD_SUPPORT
 #  define EAPI __declspec(dllexport)
 # else
 #  define EAPI __declspec(dllimport)
--- a/src/lib/auto_comp.c
+++ b/src/lib/auto_comp.c
@ -2,8 +2,6 @@
 #include "config.h"
 #endif

-#define ENVENTOR_BUILD
-
 #include <Enventor.h>
 #include "enventor_private.h"
 #include "auto_comp_code.h"
--- a/src/lib/ctxpopup.c
+++ b/src/lib/ctxpopup.c
@ -2,8 +2,6 @@
 #include "config.h"
 #endif

-#define ENVENTOR_BUILD
-
 #include <Enventor.h>
 #include "enventor_private.h"

--- a/src/lib/dummy_obj.c
+++ b/src/lib/dummy_obj.c
@ -3,7 +3,6 @@
 #endif

 #define EDJE_EDIT_IS_UNSTABLE_AND_I_KNOW_ABOUT_IT 1
-#define ENVENTOR_BUILD

 #include <Enventor.h>
 #include <Edje_Edit.h>
--- a/src/lib/edc_editor.c
+++ b/src/lib/edc_editor.c
@ -3,7 +3,6 @@
 #endif

 #define ENVENTOR_BETA_API_SUPPORT 1
-#define ENVENTOR_BUILD

 #include <Enventor.h>
 #include <Eio.h>
--- a/src/lib/edc_parser.c
+++ b/src/lib/edc_parser.c
@ -2,8 +2,6 @@
 #include "config.h"
 #endif

-#define ENVENTOR_BUILD
-
 #include <Enventor.h>
 #include "enventor_private.h"

--- a/src/lib/edj_mgr.c
+++ b/src/lib/edj_mgr.c
@ -2,8 +2,6 @@
 #include "config.h"
 #endif

-#define ENVENTOR_BUILD
-
 #include <Enventor.h>
 #include "enventor_private.h"

--- a/src/lib/edj_viewer.c
+++ b/src/lib/edj_viewer.c
@ -3,7 +3,6 @@
 #endif

 #define EDJE_EDIT_IS_UNSTABLE_AND_I_KNOW_ABOUT_IT 1
-#define ENVENTOR_BUILD

 #include <Enventor.h>
 #include <Edje_Edit.h>
--- a/src/lib/enventor_main.c
+++ b/src/lib/enventor_main.c
@ -2,8 +2,6 @@
 #include "config.h"
 #endif

-#define ENVENTOR_BUILD
-
 #include <Enventor.h>
 #include <Eio.h>
 #include "enventor_private.h"
--- a/src/lib/enventor_smart.c
+++ b/src/lib/enventor_smart.c
@ -3,7 +3,6 @@
 #endif

 #define ELM_INTERNAL_API_ARGESFSDFEFC 1
-#define ENVENTOR_BUILD

 #include <Enventor.h>
 #include <Eio.h>
--- a/src/lib/indent.c
+++ b/src/lib/indent.c
@ -2,8 +2,6 @@
 #include "config.h"
 #endif

-#define ENVENTOR_BUILD
-
 #include <Enventor.h>
 #include "enventor_private.h"

--- a/src/lib/redoundo.c
+++ b/src/lib/redoundo.c
@ -2,8 +2,6 @@
 #include "config.h"
 #endif

-#define ENVENTOR_BUILD
-
 #include <Enventor.h>
 #include "enventor_private.h"

--- a/src/lib/syntax_color.c
+++ b/src/lib/syntax_color.c
@ -2,8 +2,6 @@
 #include "config.h"
 #endif

-#define ENVENTOR_BUILD
-
 #include <Enventor.h>
 #include "enventor_private.h"

--- a/src/lib/syntax_helper.c
+++ b/src/lib/syntax_helper.c
@ -2,8 +2,6 @@
 #include "config.h"
 #endif

-#define ENVENTOR_BUILD
-
 #include <Enventor.h>
 #include "enventor_private.h"

--- a/src/lib/template.c
+++ b/src/lib/template.c
@ -2,8 +2,6 @@
 #include "config.h"
 #endif

-#define ENVENTOR_BUILD
-
 #include <Enventor.h>
 #include "enventor_private.h"
 #include "template_code.h"