hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=cdab9f0a5d3b0fabfada7d111dec0c2c2677e956
commit cdab9f0a5d3b0fabfada7d111dec0c2c2677e956 Author: ChunEon Park <[email protected]> Date: Sat Feb 28 15:13:23 2015 +0900 clean up code for supporting dllexport in win32. --- configure.ac | 1 + src/lib/Enventor_Eo.h | 2 +- src/lib/Enventor_Legacy.h | 2 +- src/lib/auto_comp.c | 2 -- src/lib/ctxpopup.c | 2 -- src/lib/dummy_obj.c | 1 - src/lib/edc_editor.c | 1 - src/lib/edc_parser.c | 2 -- src/lib/edj_mgr.c | 2 -- src/lib/edj_viewer.c | 1 - src/lib/enventor_main.c | 2 -- src/lib/enventor_smart.c | 1 - src/lib/indent.c | 2 -- src/lib/redoundo.c | 2 -- src/lib/syntax_color.c | 2 -- src/lib/syntax_helper.c | 2 -- src/lib/template.c | 2 -- 17 files changed, 3 insertions(+), 26 deletions(-) diff --git a/configure.ac b/configure.ac index 5edf314..1a8a1b5 100644 --- 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=" \ diff --git a/src/lib/Enventor_Eo.h b/src/lib/Enventor_Eo.h index 1a0d253..76f204c 100644 --- 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 diff --git a/src/lib/Enventor_Legacy.h b/src/lib/Enventor_Legacy.h index 93fb349..d2bb2ce 100644 --- 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) diff --git a/src/lib/auto_comp.c b/src/lib/auto_comp.c index 2cd35c1..6d3f385 100644 --- 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" diff --git a/src/lib/ctxpopup.c b/src/lib/ctxpopup.c index 80e19d8..a258e36 100644 --- 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" diff --git a/src/lib/dummy_obj.c b/src/lib/dummy_obj.c index 537ce96..9666a11 100644 --- 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> diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c index 867650e..49523eb 100644 --- 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> diff --git a/src/lib/edc_parser.c b/src/lib/edc_parser.c index 336f77c..bcf6d40 100644 --- 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" diff --git a/src/lib/edj_mgr.c b/src/lib/edj_mgr.c index c149ed4..9059c5c 100644 --- 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" diff --git a/src/lib/edj_viewer.c b/src/lib/edj_viewer.c index dd673c9..1b48ea5 100644 --- 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> diff --git a/src/lib/enventor_main.c b/src/lib/enventor_main.c index bf43044..646cb49 100644 --- 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" diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c index 5c231cf..321cf67 100644 --- 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> diff --git a/src/lib/indent.c b/src/lib/indent.c index 259bb67..18bdbeb 100644 --- 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" diff --git a/src/lib/redoundo.c b/src/lib/redoundo.c index 7c54442..2b9dbf7 100644 --- 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" diff --git a/src/lib/syntax_color.c b/src/lib/syntax_color.c index af6b2bb..bd432cd 100644 --- 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" diff --git a/src/lib/syntax_helper.c b/src/lib/syntax_helper.c index 93c504b..1a5ebd2 100644 --- 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" diff --git a/src/lib/template.c b/src/lib/template.c index d6d4b5a..3999592 100644 --- 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" --
