don't build the ecore_x dependant parts if we didn't built ecore_x at all
SVN revision: 11401
This commit is contained in:
parent
bce01bbf1d
commit
ae85a8a85c
|
@ -24,6 +24,7 @@
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#define HAVE_ECORE_EVAS_X @BUILD_ECORE_X@
|
||||||
#define HAVE_ECORE_EVAS_FB @BUILD_ECORE_EVAS_FB@
|
#define HAVE_ECORE_EVAS_FB @BUILD_ECORE_EVAS_FB@
|
||||||
#define HAVE_ECORE_EVAS_GL @BUILD_ECORE_EVAS_GL@
|
#define HAVE_ECORE_EVAS_GL @BUILD_ECORE_EVAS_GL@
|
||||||
|
|
||||||
|
@ -42,6 +43,7 @@ int ecore_evas_init(void);
|
||||||
int ecore_evas_shutdown(void);
|
int ecore_evas_shutdown(void);
|
||||||
|
|
||||||
/* engine/target specific init calls */
|
/* engine/target specific init calls */
|
||||||
|
#if HAVE_ECORE_EVAS_X
|
||||||
Ecore_Evas *ecore_evas_software_x11_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h);
|
Ecore_Evas *ecore_evas_software_x11_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h);
|
||||||
Ecore_X_Window ecore_evas_software_x11_window_get(Ecore_Evas *ee);
|
Ecore_X_Window ecore_evas_software_x11_window_get(Ecore_Evas *ee);
|
||||||
|
|
||||||
|
@ -49,6 +51,7 @@ Ecore_X_Window ecore_evas_software_x11_window_get(Ecore_Evas *ee);
|
||||||
Ecore_Evas *ecore_evas_gl_x11_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h);
|
Ecore_Evas *ecore_evas_gl_x11_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h);
|
||||||
Ecore_X_Window ecore_evas_gl_x11_window_get(Ecore_Evas *ee);
|
Ecore_X_Window ecore_evas_gl_x11_window_get(Ecore_Evas *ee);
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#if HAVE_ECORE_EVAS_FB
|
#if HAVE_ECORE_EVAS_FB
|
||||||
Ecore_Evas *ecore_evas_fb_new(char *disp_name, int rotation, int w, int h);
|
Ecore_Evas *ecore_evas_fb_new(char *disp_name, int rotation, int w, int h);
|
||||||
|
|
|
@ -42,10 +42,13 @@ Ecore_Evas.h
|
||||||
|
|
||||||
libecore_evas_la_SOURCES = \
|
libecore_evas_la_SOURCES = \
|
||||||
ecore_evas.c \
|
ecore_evas.c \
|
||||||
ecore_evas_x.c \
|
|
||||||
ecore_evas_fb.c \
|
ecore_evas_fb.c \
|
||||||
ecore_evas_private.h
|
ecore_evas_private.h
|
||||||
|
|
||||||
|
if BUILD_ECORE_X
|
||||||
|
libecore_evas_la_SOURCES += ecore_evas_x.c
|
||||||
|
endif
|
||||||
|
|
||||||
libecore_evas_la_LIBADD = \
|
libecore_evas_la_LIBADD = \
|
||||||
$(ECORE_X_LIB) \
|
$(ECORE_X_LIB) \
|
||||||
$(ECORE_FB_LIB) \
|
$(ECORE_FB_LIB) \
|
||||||
|
|
|
@ -3,11 +3,8 @@
|
||||||
#include "ecore_private.h"
|
#include "ecore_private.h"
|
||||||
#include "ecore_evas_private.h"
|
#include "ecore_evas_private.h"
|
||||||
#include "Ecore_Evas.h"
|
#include "Ecore_Evas.h"
|
||||||
#ifdef BUILD_ECORE_X
|
|
||||||
#include "Ecore_X.h"
|
#include "Ecore_X.h"
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef BUILD_ECORE_X
|
|
||||||
static int _ecore_evas_init_count = 0;
|
static int _ecore_evas_init_count = 0;
|
||||||
|
|
||||||
static int _ecore_evas_fps_debug = 0;
|
static int _ecore_evas_fps_debug = 0;
|
||||||
|
@ -1117,7 +1114,6 @@ static const Ecore_Evas_Engine_Func _ecore_x_engine_func =
|
||||||
_ecore_evas_withdrawn_set,
|
_ecore_evas_withdrawn_set,
|
||||||
_ecore_evas_sticky_set
|
_ecore_evas_sticky_set
|
||||||
};
|
};
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* To be documented.
|
* To be documented.
|
||||||
|
@ -1128,7 +1124,6 @@ Ecore_Evas *
|
||||||
ecore_evas_software_x11_new(const char *disp_name, Ecore_X_Window parent,
|
ecore_evas_software_x11_new(const char *disp_name, Ecore_X_Window parent,
|
||||||
int x, int y, int w, int h)
|
int x, int y, int w, int h)
|
||||||
{
|
{
|
||||||
#ifdef BUILD_ECORE_X
|
|
||||||
Evas_Engine_Info_Software_X11 *einfo;
|
Evas_Engine_Info_Software_X11 *einfo;
|
||||||
Ecore_Evas *ee;
|
Ecore_Evas *ee;
|
||||||
int rmethod;
|
int rmethod;
|
||||||
|
@ -1192,16 +1187,24 @@ ecore_evas_software_x11_new(const char *disp_name, Ecore_X_Window parent,
|
||||||
|
|
||||||
ecore_evases = _ecore_list_prepend(ecore_evases, ee);
|
ecore_evases = _ecore_list_prepend(ecore_evases, ee);
|
||||||
return ee;
|
return ee;
|
||||||
#else
|
|
||||||
return NULL;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* To be documented.
|
||||||
|
*
|
||||||
|
* FIXME: To be fixed.
|
||||||
|
*/
|
||||||
|
Ecore_X_Window
|
||||||
|
ecore_evas_software_x11_window_get(Ecore_Evas *ee)
|
||||||
|
{
|
||||||
|
return ee->engine.x.win_container;
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef BUILD_ECORE_EVAS_GL
|
||||||
Ecore_Evas *
|
Ecore_Evas *
|
||||||
ecore_evas_gl_x11_new(const char *disp_name, Ecore_X_Window parent,
|
ecore_evas_gl_x11_new(const char *disp_name, Ecore_X_Window parent,
|
||||||
int x, int y, int w, int h)
|
int x, int y, int w, int h)
|
||||||
{
|
{
|
||||||
#ifdef BUILD_ECORE_EVAS_GL
|
|
||||||
Evas_Engine_Info_GL_X11 *einfo;
|
Evas_Engine_Info_GL_X11 *einfo;
|
||||||
Ecore_Evas *ee;
|
Ecore_Evas *ee;
|
||||||
int rmethod;
|
int rmethod;
|
||||||
|
@ -1289,24 +1292,6 @@ ecore_evas_gl_x11_new(const char *disp_name, Ecore_X_Window parent,
|
||||||
|
|
||||||
ecore_evases = _ecore_list_prepend(ecore_evases, ee);
|
ecore_evases = _ecore_list_prepend(ecore_evases, ee);
|
||||||
return ee;
|
return ee;
|
||||||
#else
|
|
||||||
return NULL;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* To be documented.
|
|
||||||
*
|
|
||||||
* FIXME: To be fixed.
|
|
||||||
*/
|
|
||||||
Ecore_X_Window
|
|
||||||
ecore_evas_software_x11_window_get(Ecore_Evas *ee)
|
|
||||||
{
|
|
||||||
#ifdef BUILD_ECORE_X
|
|
||||||
return ee->engine.x.win_container;
|
|
||||||
#else
|
|
||||||
return 0;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1317,9 +1302,6 @@ ecore_evas_software_x11_window_get(Ecore_Evas *ee)
|
||||||
Ecore_X_Window
|
Ecore_X_Window
|
||||||
ecore_evas_gl_x11_window_get(Ecore_Evas *ee)
|
ecore_evas_gl_x11_window_get(Ecore_Evas *ee)
|
||||||
{
|
{
|
||||||
#ifdef BUILD_ECORE_X
|
|
||||||
return ee->engine.x.win_container;
|
return ee->engine.x.win_container;
|
||||||
#else
|
|
||||||
return 0;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue