Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore
Modified Files:
Makefile.am configure.in
Added Files:
ecore-win32.pc.in
Log Message:
add windows support to ecore. ecore_evas is ported too (directdraw and
direct3d. No opengl yet). It needs to be tested a lot, though. Remove some
trailing spaces here and there. Replace WIN32 with _WIN32
===================================================================
RCS file: /cvs/e/e17/libs/ecore/Makefile.am,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- Makefile.am 16 Jul 2007 07:23:10 -0000 1.37
+++ Makefile.am 26 Aug 2007 11:17:20 -0000 1.38
@@ -21,6 +21,7 @@
ecore-job.pc \
ecore-txt.pc \
ecore-x.pc \
+ ecore-win32.pc \
ecore-sdl.pc \
ecore.pc
@@ -40,6 +41,7 @@
ecore-job.pc.in \
ecore-txt.pc.in \
ecore-x.pc.in \
+ ecore-win32.pc.in \
ecore-sdl.pc.in \
ecore.spec.in ecore.spec \
debian/changelog \
@@ -105,6 +107,11 @@
px = ecore-x.pc
endif
+if BUILD_ECORE_WIN32
+pwin32 = ecore-win32.pc
+endif
+
+
if BUILD_ECORE_SDL
psdl = ecore-sdl.pc
endif
@@ -116,4 +123,5 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = \
ecore.pc $(pcon) $(pconfig) $(pdfb) $(pevas) \
- $(pfb) $(pfile) $(pdesktop) $(pipc) $(pjob) $(ptxt) $(px) $(psdl)
+ $(pfb) $(pfile) $(pdesktop) $(pipc) $(pjob) $(ptxt) \
+ $(px) $(pwin32) $(psdl)
===================================================================
RCS file: /cvs/e/e17/libs/ecore/configure.in,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -3 -r1.206 -r1.207
--- configure.in 22 Aug 2007 17:24:44 -0000 1.206
+++ configure.in 26 Aug 2007 11:17:20 -0000 1.207
@@ -17,7 +17,7 @@
AM_ENABLE_SHARED
AM_PROG_LIBTOOL
AC_C___ATTRIBUTE__
-
+
if test "x${bindir}" = 'xNONE'; then
if test "x${prefix}" = "xNONE"; then
PACKAGE_BIN_DIR="${ac_default_prefix}/bin"
@@ -28,7 +28,7 @@
PACKAGE_BIN_DIR="${bindir}"
fi
AC_SUBST(PACKAGE_BIN_DIR)
-
+
if test "x${libdir}" = 'xNONE'; then
if test "x${prefix}" = "xNONE"; then
PACKAGE_LIB_DIR="${ac_default_prefix}/lib"
@@ -72,6 +72,7 @@
requirements_ecore_job=""
requirements_ecore_txt=""
requirements_ecore_x=""
+requirements_ecore_win32=""
requirements_ecore_sdl=""
dnl The first call to PKG_CHECK_MODULES is done conditionally,
@@ -115,7 +116,7 @@
have_iconv="yes"
]
)
-
+
if test "x$have_iconv" != "xyes"; then
AC_CHECK_LIB(iconv, iconv,
[
@@ -285,7 +286,7 @@
AC_SUBST(Xcursor_cflags)
AC_SUBST(Xcursor_libs)
-
+
ECORE_CHECK_X_EXTENSION([Xdamage], [Xdamage.h], [Xdamage], [XDamageSubtract])
ECORE_CHECK_X_EXTENSION([Xdpms], [dpms.h], [Xdpms], [DPMSQueryExtension])
if test "x$use_xdpms" = "xno" ; then
@@ -303,6 +304,31 @@
fi
+AC_CHECK_HEADER(ddraw.h,
+ [ have_ddraw="yes"
+ AC_DEFINE(HAVE_DIRECTDRAW, 1, [Build Ecore_Win32 with DirectDraw Code])
+ ddraw_libs="-lddraw -ldxguid" ],
+ [ have_ddraw="no" ]
+)
+AC_SUBST(ddraw_libs)
+
+AC_CHECK_HEADERS(d3d9.h d3dx9.h,
+ [ have_direct3d="yes"
+ AC_DEFINE(HAVE_DIRECT3D, 1, [Build Ecore_Win32 with Direct3D Code])
+ direct3d_libs="-ld3d9 -ld3dx9d" ],
+ [ have_direct3d="no" ]
+)
+AC_SUBST(direct3d_libs)
+
+have_win32="no"
+if test "x${have_ddraw}" = "xyes" -o "x${have_direct3d}" = "xyes"; then
+ have_win32="yes"
+fi
+
+ECORE_CHECK_MODULE([Win32], [no], [$have_win32],
+ [ecore_win32_libs="$ecore_win32_libs $ddraw_libs $direct3d_libs"])
+
+
ECORE_CHECK_MODULE([Job], [yes])
PKG_CHECK_MODULES(DIRECTFB, directfb >= 0.9.16,
@@ -462,7 +488,7 @@
AC_ARG_ENABLE(ecore-evas-dfb,
[ --disable-ecore-evas-dfb disable DirectFB in the ecore_evas module],
[
- if test "x$enableval" = "xno" ; then
+ if test "x$enableval" = "xno" ; then
want_ecore_evas_dfb=no
else
want_ecore_evas_dfb=yes
@@ -496,10 +522,10 @@
have_ecore_evas_fb="no";
AC_MSG_CHECKING(whether ecore_evas fb support is to be built)
-AC_ARG_ENABLE(ecore-evas-fb,
+AC_ARG_ENABLE(ecore-evas-fb,
[ --enable-ecore-evas-fb enable fb in the ecore_evas module],
[
- if test x"$enableval" = x"yes" ; then
+ if test x"$enableval" = x"yes" ; then
AC_MSG_RESULT(yes)
want_ecore_evas_fb="yes"
else
@@ -582,10 +608,10 @@
have_ecore_evas_buffer="no";
AC_MSG_CHECKING(whether ecore_evas buffer support is to be built)
-AC_ARG_ENABLE(ecore-evas-buffer,
+AC_ARG_ENABLE(ecore-evas-buffer,
[ --disable-ecore-evas-buffer disable buffer in the ecore_evas module],
[
- if test x"$enableval" = x"yes" ; then
+ if test x"$enableval" = x"yes" ; then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
@@ -672,10 +698,10 @@
if test "x$have_ecore_file" = "xyes"; then
dnl We need to check if the right inotify version is accessible
AC_MSG_CHECKING(whether inotify is to be used for filemonitoring)
- AC_ARG_ENABLE(inotify,
+ AC_ARG_ENABLE(inotify,
[ --disable-inotify disable inotify in the ecore_file module],
[
- if test "$enableval" = "yes"; then
+ if test "$enableval" = "yes"; then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
@@ -685,7 +711,7 @@
AC_MSG_RESULT(yes)
]
)
-
+
dnl It's hard to find a good test on how to check the correct
dnl inotify version. They changed the headers a lot.
dnl in kernel 2.6.13 __NR_inotify_init was added to the defined syscalls
@@ -708,16 +734,16 @@
], [
use_inotify="no"
]
- )
+ )
]
)
fi
-
+
#AC_MSG_CHECKING(whether FAM is to be used for filemonitoring)
- #AC_ARG_ENABLE(fam,
+ #AC_ARG_ENABLE(fam,
# [ --enable-fam enable fam in the ecore_file module],
# [
- # if test "$enableval" = "yes"; then
+ # if test "$enableval" = "yes"; then
# AC_MSG_RESULT(yes)
# use_fam="yes"
# else
@@ -727,7 +753,7 @@
# AC_MSG_RESULT(no)
# ]
#)
-
+
fam_libs=""
#if test "x$use_fam" = "xyes"; then
# AC_CHECK_LIB(fam, FAMOpen,
@@ -740,12 +766,12 @@
# ]
# )
#fi
-
+
AC_MSG_CHECKING(whether polling is to be used for filemonitoring)
- AC_ARG_ENABLE(poll,
+ AC_ARG_ENABLE(poll,
[ --disable-poll disable poll in the ecore_file module],
[
- if test "$enableval" = "yes"; then
+ if test "$enableval" = "yes"; then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
@@ -755,27 +781,27 @@
AC_MSG_RESULT(yes)
]
)
-
+
if test "x$use_poll" = "xyes"; then
AC_DEFINE(HAVE_POLL, 1, [ File monitoring with polling ])
fi
-
+
use_curl="yes"
AC_MSG_CHECKING(whether CURL is to be used for file download)
- AC_ARG_ENABLE(curl,
+ AC_ARG_ENABLE(curl,
[ --disable-curl disable curl in the ecore_file module],
[
- if test "$enableval" = "yes"; then
+ if test "$enableval" = "yes"; then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
- use_curl="no"
+ use_curl="no"
fi
], [
AC_MSG_RESULT(yes)
]
)
-
+
if test "x$use_curl" = "xyes"; then
PKG_CHECK_MODULES(CURL, libcurl,
[
@@ -837,6 +863,7 @@
ecore-job.pc
ecore-txt.pc
ecore-x.pc
+ecore-win32.pc
ecore-sdl.pc
ecore.pc
src/Makefile
@@ -855,6 +882,7 @@
src/lib/ecore_file/Makefile
src/lib/ecore_desktop/Makefile
src/lib/ecore_directfb/Makefile
+src/lib/ecore_win32/Makefile
README
ecore.spec
debian/changelog
@@ -873,13 +901,15 @@
else
echo " Ecore_X (Xlib backend).......: $have_ecore_x (Xcursor: $use_Xcursor)
(Xprint: $use_xprint) (Xinerama: $use_xinerama) (Xrandr: $use_xrandr)
(Xscreensaver: $use_xss) (Xrender: $use_xrender) (Xfixes: $use_xfixes)
(Xdamage: $use_xdamage) (Xdpms: $use_xdpms)"
fi
+echo " Ecore_Win32..................: $have_ecore_win32 (DirectDraw:
${have_ddraw}) (Direct3D: ${have_direct3d})"
+
echo " Ecore_FB.....................: $have_ecore_fb"
echo " Ecore_DFB....................: $have_ecore_directfb"
echo " Ecore_SDL....................: $have_ecore_sdl"
echo " Ecore_Evas...................: $have_ecore_evas"
echo " Ecore_Evas GL Support........: $have_ecore_evas_gl"
echo " Ecore_Evas XRender Support...: $have_ecore_evas_xrender"
-echo " Ecore_Evas X11 16bpp Support.: $have_ecore_evas_16_x11"
+echo " Ecore_Evas X11 16bpp Support.: $have_ecore_evas_x11_16"
echo " Ecore_Evas FB Support........: $have_ecore_evas_fb"
echo " Ecore_Evas SDL Support.......: $have_ecore_evas_sdl"
echo " Ecore_Evas DFB Support.......: $have_ecore_evas_dfb"
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
