rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=db0d054eec7aaae5be064c23701d45a2c5dc8950
commit db0d054eec7aaae5be064c23701d45a2c5dc8950
Author: Andrii Kroitor <an.kroi...@samsung.com>
Date: Mon Nov 28 11:40:20 2016 +0200
fix build on Windows on efl upstream
Change-Id: Id2669979c0bfed600f3b912c312c2097a282b41d
---
src/bin/Makefile.am | 2 +-
src/lib/ewe_ruler.c | 4 ++++
src/lib/ewe_ruler.h | 7 -------
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index ae74630..f792aef 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -204,8 +204,8 @@ libete_a_CPPFLAGS = ${eflete_CPPFLAGS} \
eflete_LDADD = \
libete.a \
-@EFL_LIBS@ \
${top_builddir}/src/lib/libewe.a \
+@EFL_LIBS@ \
@LTLIBINTL@
eflete_exporter_SOURCES = ../../src/bin/exporter/eflete_exporter.c
diff --git a/src/lib/ewe_ruler.c b/src/lib/ewe_ruler.c
index 3e32f0b..95888c0 100644
--- a/src/lib/ewe_ruler.c
+++ b/src/lib/ewe_ruler.c
@@ -15,8 +15,12 @@
* You should have received a copy of the GNU Lesser General Public License
* along with this program; If not, see www.gnu.org/licenses/lgpl.html.
*/
+
#include "ewe_private.h"
#include "ewe_widget_ruler.h"
+#undef EAPI
+#define EAPI
+#include "ewe_ruler_eo.h"
#define MY_CLASS EWE_RULER_CLASS
diff --git a/src/lib/ewe_ruler.h b/src/lib/ewe_ruler.h
index 74376f4..ee52b70 100644
--- a/src/lib/ewe_ruler.h
+++ b/src/lib/ewe_ruler.h
@@ -32,13 +32,6 @@
*/
#include "ewe_ruler_common.h"
-
-#ifdef EFL_EO_API_SUPPORT
-#include "ewe_ruler_eo.h"
-#endif
-
-#ifndef EFL_NOLEGACY_API_SUPPORT
#include "ewe_ruler_legacy.h"
-#endif
#endif /* EWE_RULER_H */
--
