cedric pushed a commit to branch master.
commit e133ddc34b45cc855af8faced214cdb05716cdd4
Author: Cedric Bail <[email protected]>
Date: Fri Jun 28 10:22:52 2013 +0900
elementary: fix build without public Eo API turned on.
---
configure.ac | 2 ++
m4/efl_eo.m4 | 6 ++++++
src/lib/elm_photocam.h | 12 ++++++++++++
src/lib/elm_photocam_eo.h | 12 ------------
4 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/configure.ac b/configure.ac
index 0ab9f41..12f5362 100644
--- a/configure.ac
+++ b/configure.ac
@@ -240,6 +240,8 @@ PKG_CHECK_MODULES([ELEMENTARY],
]
)
+EFL_ENABLE_EO_API_SUPPORT
+
requirement_elm="edje >= 1.7.99 ecore-file >= 1.7.99 ecore-evas >= 1.7.99
ecore >= 1.7.99 evas >= 1.7.99 eet >= 1.7.99 eina >= 1.7.99 ${requirement_elm}"
PKG_CHECK_MODULES([ELEMENTARY_ECORE_IMF],
diff --git a/m4/efl_eo.m4 b/m4/efl_eo.m4
new file mode 100644
index 0000000..864baf5
--- /dev/null
+++ b/m4/efl_eo.m4
@@ -0,0 +1,6 @@
+dnl use: EFL_ENABLE_EO_API_SUPPORT
+AC_DEFUN([EFL_ENABLE_EO_API_SUPPORT],
+[
+ AC_DEFINE([EFL_EO_API_SUPPORT], [1], [Enable access to unstable EFL Eo API])
+])
+
diff --git a/src/lib/elm_photocam.h b/src/lib/elm_photocam.h
index cdfc46b..18b6cec 100644
--- a/src/lib/elm_photocam.h
+++ b/src/lib/elm_photocam.h
@@ -56,6 +56,18 @@
* @{
*/
+/**
+ * @brief Types of zoom available.
+ */
+typedef enum
+{
+ ELM_PHOTOCAM_ZOOM_MODE_MANUAL = 0, /**< Zoom controlled normally by
elm_photocam_zoom_set */
+ ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT, /**< Zoom until photo fits in photocam */
+ ELM_PHOTOCAM_ZOOM_MODE_AUTO_FILL, /**< Zoom until photo fills photocam */
+ ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT_IN, /**< Zoom in until photo fits in
photocam */
+ ELM_PHOTOCAM_ZOOM_MODE_LAST
+} Elm_Photocam_Zoom_Mode;
+
#ifdef EFL_EO_API_SUPPORT
#include "elm_photocam_eo.h"
#endif
diff --git a/src/lib/elm_photocam_eo.h b/src/lib/elm_photocam_eo.h
index c98ab89..477408c 100644
--- a/src/lib/elm_photocam_eo.h
+++ b/src/lib/elm_photocam_eo.h
@@ -2,18 +2,6 @@
const Eo_Class *elm_obj_photocam_pan_class_get(void) EINA_CONST;
-/**
- * @brief Types of zoom available.
- */
-typedef enum
-{
- ELM_PHOTOCAM_ZOOM_MODE_MANUAL = 0, /**< Zoom controlled normally by
elm_photocam_zoom_set */
- ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT, /**< Zoom until photo fits in photocam */
- ELM_PHOTOCAM_ZOOM_MODE_AUTO_FILL, /**< Zoom until photo fills photocam */
- ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT_IN, /**< Zoom in until photo fits in
photocam */
- ELM_PHOTOCAM_ZOOM_MODE_LAST
-} Elm_Photocam_Zoom_Mode;
-
#define ELM_OBJ_PHOTOCAM_CLASS elm_obj_photocam_class_get()
const Eo_Class *elm_obj_photocam_class_get(void) EINA_CONST;
--
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
