forked from enlightenment/efl
* add Evil cflags and libs in ecore_job and ecore_imf Makefile.am's
in case Evil is not installed in /usr/local * define fullscreen default values for the win ce engines in ecore_evas: - gdi engine is windowed - the other engines are fullscreen SVN revision: 38647
This commit is contained in:
parent
a1d61c71c2
commit
621e507655
|
@ -933,7 +933,8 @@ ecore_evas_software_wince_new_internal(int backend,
|
||||||
int x,
|
int x,
|
||||||
int y,
|
int y,
|
||||||
int width,
|
int width,
|
||||||
int height)
|
int height,
|
||||||
|
int fullscreen)
|
||||||
{
|
{
|
||||||
Evas_Engine_Info_Software_16_WinCE *einfo;
|
Evas_Engine_Info_Software_16_WinCE *einfo;
|
||||||
Ecore_Evas *ee;
|
Ecore_Evas *ee;
|
||||||
|
@ -1005,6 +1006,7 @@ ecore_evas_software_wince_new_internal(int backend,
|
||||||
einfo->info.height = height;
|
einfo->info.height = height;
|
||||||
einfo->info.backend = backend;
|
einfo->info.backend = backend;
|
||||||
einfo->info.rotation = 0;
|
einfo->info.rotation = 0;
|
||||||
|
einfo->info.fullscreen = fullscreen;
|
||||||
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
|
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
|
||||||
|
|
||||||
ecore_wince_window_backend_set(ee->engine.wince.window, backend);
|
ecore_wince_window_backend_set(ee->engine.wince.window, backend);
|
||||||
|
@ -1040,7 +1042,7 @@ ecore_evas_software_wince_new(Ecore_WinCE_Window *parent,
|
||||||
int height)
|
int height)
|
||||||
{
|
{
|
||||||
#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE
|
#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE
|
||||||
return ecore_evas_software_wince_new_internal(0, parent, x, y, width, height);
|
return ecore_evas_software_wince_new_internal(0, parent, x, y, width, height, 1);
|
||||||
#else
|
#else
|
||||||
return NULL;
|
return NULL;
|
||||||
parent = NULL;
|
parent = NULL;
|
||||||
|
@ -1059,7 +1061,7 @@ ecore_evas_software_wince_fb_new(Ecore_WinCE_Window *parent,
|
||||||
int height)
|
int height)
|
||||||
{
|
{
|
||||||
#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE
|
#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE
|
||||||
return ecore_evas_software_wince_new_internal(1, parent, x, y, width, height);
|
return ecore_evas_software_wince_new_internal(1, parent, x, y, width, height, 1);
|
||||||
#else
|
#else
|
||||||
return NULL;
|
return NULL;
|
||||||
parent = NULL;
|
parent = NULL;
|
||||||
|
@ -1078,7 +1080,7 @@ ecore_evas_software_wince_gapi_new(Ecore_WinCE_Window *parent,
|
||||||
int height)
|
int height)
|
||||||
{
|
{
|
||||||
#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE
|
#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE
|
||||||
return ecore_evas_software_wince_new_internal(2, parent, x, y, width, height);
|
return ecore_evas_software_wince_new_internal(2, parent, x, y, width, height, 1);
|
||||||
#else
|
#else
|
||||||
return NULL;
|
return NULL;
|
||||||
parent = NULL;
|
parent = NULL;
|
||||||
|
@ -1097,7 +1099,7 @@ ecore_evas_software_wince_ddraw_new(Ecore_WinCE_Window *parent,
|
||||||
int height)
|
int height)
|
||||||
{
|
{
|
||||||
#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE
|
#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE
|
||||||
return ecore_evas_software_wince_new_internal(3, parent, x, y, width, height);
|
return ecore_evas_software_wince_new_internal(3, parent, x, y, width, height, 1);
|
||||||
#else
|
#else
|
||||||
return NULL;
|
return NULL;
|
||||||
parent = NULL;
|
parent = NULL;
|
||||||
|
@ -1116,7 +1118,7 @@ ecore_evas_software_wince_gdi_new(Ecore_WinCE_Window *parent,
|
||||||
int height)
|
int height)
|
||||||
{
|
{
|
||||||
#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE
|
#ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE
|
||||||
return ecore_evas_software_wince_new_internal(4, parent, x, y, width, height);
|
return ecore_evas_software_wince_new_internal(4, parent, x, y, width, height, 0);
|
||||||
#else
|
#else
|
||||||
return NULL;
|
return NULL;
|
||||||
parent = NULL;
|
parent = NULL;
|
||||||
|
|
|
@ -4,6 +4,7 @@ if BUILD_ECORE_IMF
|
||||||
AM_CPPFLAGS = \
|
AM_CPPFLAGS = \
|
||||||
-I$(top_srcdir)/src/lib/ecore \
|
-I$(top_srcdir)/src/lib/ecore \
|
||||||
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
|
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
|
||||||
|
@EVIL_CFLAGS@ \
|
||||||
@EINA_CFLAGS@
|
@EINA_CFLAGS@
|
||||||
|
|
||||||
AM_CFLAGS = @WIN32_CFLAGS@
|
AM_CFLAGS = @WIN32_CFLAGS@
|
||||||
|
@ -19,7 +20,8 @@ ecore_imf_module.c
|
||||||
|
|
||||||
libecore_imf_la_LIBADD = \
|
libecore_imf_la_LIBADD = \
|
||||||
$(top_builddir)/src/lib/ecore/libecore.la \
|
$(top_builddir)/src/lib/ecore/libecore.la \
|
||||||
@EINA_LIBS@
|
@EINA_LIBS@ \
|
||||||
|
@EVIL_LIBS@
|
||||||
|
|
||||||
libecore_imf_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
|
libecore_imf_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -3,6 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in
|
||||||
AM_CPPFLAGS = \
|
AM_CPPFLAGS = \
|
||||||
-I$(top_srcdir)/src/lib/ecore \
|
-I$(top_srcdir)/src/lib/ecore \
|
||||||
-I$(top_builddir)/src/lib/ecore \
|
-I$(top_builddir)/src/lib/ecore \
|
||||||
|
@EVIL_CFLAGS@ \
|
||||||
@EINA_CFLAGS@
|
@EINA_CFLAGS@
|
||||||
|
|
||||||
AM_CFLAGS = @WIN32_CFLAGS@
|
AM_CFLAGS = @WIN32_CFLAGS@
|
||||||
|
@ -18,7 +19,8 @@ ecore_job.c
|
||||||
|
|
||||||
libecore_job_la_LIBADD = \
|
libecore_job_la_LIBADD = \
|
||||||
$(top_builddir)/src/lib/ecore/libecore.la \
|
$(top_builddir)/src/lib/ecore/libecore.la \
|
||||||
@EINA_LIBS@
|
@EINA_LIBS@ \
|
||||||
|
@EVIL_LIBS@
|
||||||
|
|
||||||
libecore_job_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
|
libecore_job_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue