Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_win32
Modified Files:
Ecore_Win32.h Makefile.am ecore_win32.c
ecore_win32_direct3d.cpp ecore_win32_private.h
ecore_win32_window.c
Log Message:
integration of evil in ecore. It's compiling on windows and my ubuntu. The
commit is big, please report any problem
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_win32/Ecore_Win32.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Ecore_Win32.h 21 Nov 2007 12:16:16 -0000 1.4
+++ Ecore_Win32.h 26 May 2008 05:16:34 -0000 1.5
@@ -9,12 +9,17 @@
#ifdef EAPI
# undef EAPI
#endif
-#ifdef _MSC_VER
-# ifdef BUILDING_DLL
-# define EAPI __declspec(dllexport)
+
+#ifdef _WIN32
+# ifdef EFL_ECORE_WIN32_BUILD
+# ifdef DLL_EXPORT
+# define EAPI __declspec(dllexport)
+# else
+# define EAPI
+# endif /* ! DLL_EXPORT */
# else
# define EAPI __declspec(dllimport)
-# endif
+# endif /* ! EFL_ECORE_WIN32_BUILD */
#else
# ifdef __GNUC__
# if __GNUC__ >= 4
@@ -25,7 +30,7 @@
# else
# define EAPI
# endif
-#endif
+#endif /* ! _WIN32 */
typedef void Ecore_Win32_Window;
@@ -433,6 +438,10 @@
/* DirectDraw */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
EAPI int ecore_win32_ddraw_init(Ecore_Win32_Window
*window);
EAPI int ecore_win32_ddraw_16_init(Ecore_Win32_Window
*window);
@@ -450,10 +459,6 @@
EAPI int ecore_win32_ddraw_depth_get(Ecore_Win32_Window
*window);
/* Direct3D */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
EAPI int
ecore_win32_direct3d_init(Ecore_Win32_Window *window);
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_win32/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.am 16 Nov 2007 19:31:32 -0000 1.4
+++ Makefile.am 26 May 2008 05:16:34 -0000 1.5
@@ -15,29 +15,20 @@
libecore_win32_la_SOURCES = \
ecore_win32.c \
ecore_win32_cursor.c \
+ecore_win32_ddraw.cpp \
ecore_win32_direct3d.cpp \
-ecore_win32_ddraw.c \
ecore_win32_event.c \
ecore_win32_glew.c \
-ecore_win32_window.c \
-ecore_win32_private.h
+ecore_win32_window.c
libecore_win32_la_LIBADD = \
@ddraw_libs@ @direct3d_libs@ @glew_libs@ \
--lwsock32 \
[EMAIL PROTECTED]@ \
$(top_builddir)/src/lib/ecore/libecore.la
-libecore_win32_la_LDFLAGS = @create_shared_lib@ -version-info @version_info@
+libecore_win32_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@
-version-info @version_info@
endif
EXTRA_DIST = \
-Ecore_Win32.h \
-ecore_win32.c \
-ecore_win32_cursor.c \
-ecore_win32_direct3d.cpp \
-ecore_win32_ddraw.c \
-ecore_win32_event.c \
-ecore_win32_glew.c \
-ecore_win32_window.c \
ecore_win32_private.h
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_win32/ecore_win32.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ecore_win32.c 16 Nov 2007 19:31:32 -0000 1.3
+++ ecore_win32.c 26 May 2008 05:16:34 -0000 1.4
@@ -4,7 +4,6 @@
#include <windowsx.h>
-#include "Ecore.h"
#include "ecore_win32_private.h"
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_win32/ecore_win32_direct3d.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ecore_win32_direct3d.cpp 16 Nov 2007 19:31:32 -0000 1.2
+++ ecore_win32_direct3d.cpp 26 May 2008 05:16:34 -0000 1.3
@@ -8,9 +8,6 @@
#include <cstdio>
-extern "C" {
-
-
EAPI int
ecore_win32_direct3d_init(Ecore_Win32_Window *window)
{
@@ -212,6 +209,4 @@
#else
return 0;
#endif /* HAVE_DIRECT3D */
-}
-
}
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_win32/ecore_win32_private.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ecore_win32_private.h 16 Nov 2007 19:31:32 -0000 1.3
+++ ecore_win32_private.h 26 May 2008 05:16:34 -0000 1.4
@@ -6,6 +6,10 @@
#define __ECORE_WIN32_PRIVATE_H__
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#undef WIN32_LEAN_AND_MEAN
@@ -16,8 +20,11 @@
# include <d3d9.h>
# include <d3dx9.h>
#endif /* HAVE_DIRECT3D */
+#ifdef HAVE_OPENGL_GLEW
+# include <GL/glew.h>
+#endif /* HAVE_OPENGL_GLEW */
-#include "Ecore.h"
+#include <Ecore.h>
#include <Ecore_Data.h>
#include "Ecore_Win32.h"
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_win32/ecore_win32_window.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ecore_win32_window.c 16 Nov 2007 19:31:32 -0000 1.3
+++ ecore_win32_window.c 26 May 2008 05:16:34 -0000 1.4
@@ -181,18 +181,26 @@
switch (((struct _Ecore_Win32_Window *)window)->backend)
{
case ECORE_WIN32_BACKEND_DIRECTDRAW:
+#ifdef HAVE_DIRECTDRAW
ecore_win32_ddraw_shutdown(window);
+#endif /* HAVE_DIRECTDRAW */
break;
case ECORE_WIN32_BACKEND_DIRECTDRAW_16:
+#ifdef HAVE_DIRECTDRAW
/* ecore_win32_ddraw_shutdown(window); */
+#endif /* HAVE_DIRECTDRAW */
break;
case ECORE_WIN32_BACKEND_DIRECT3D:
+#ifdef HAVE_DIRECT3D
printf ("d3d shut 0 \n");
ecore_win32_direct3d_shutdown(window);
printf ("d3d shut 1 \n");
+#endif /* HAVE_DIRECT3D */
break;
case ECORE_WIN32_BACKEND_GLEW:
+#ifdef HAVE_OPENGL_GLEW
ecore_win32_glew_shutdown(window);
+#endif /* HAVE_OPENGL_GLEW */
break;
default:
break;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
