Enlightenment CVS committal
Author : doursse
Project : e17
Module : apps/expedite
Dir : e17/apps/expedite/src/bin
Modified Files:
Makefile.am main.c main.h
Added Files:
engine_direct3d.cpp engine_direct3d.h
Log Message:
add direct3d engine support
===================================================================
RCS file: /cvs/e/e17/apps/expedite/src/bin/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Makefile.am 5 Aug 2007 07:31:57 -0000 1.7
+++ Makefile.am 17 Aug 2007 09:39:18 -0000 1.8
@@ -17,6 +17,7 @@
engine_xrender_x11.c engine_xrender_x11.h \
engine_software_16_x11.c engine_software_16_x11.h \
engine_software_ddraw.c engine_software_ddraw.h \
+engine_direct3d.cpp engine_direct3d.h \
engine_software_sdl.c engine_software_sdl.h \
ui.c ui.h \
about.c about.h \
@@ -60,4 +61,4 @@
image_blend_occlude3_very_many.c \
poly_blend.c
-expedite_LDFLAGS = @EVAS_LIBS@ @sdl_libs@ @x_libs@ @ddraw_libs@ @glew_libs@ -lm
+expedite_LDFLAGS = @EVAS_LIBS@ @sdl_libs@ @x_libs@ @ddraw_libs@ @d3d_libs@
@glew_libs@ -lm
===================================================================
RCS file: /cvs/e/e17/apps/expedite/src/bin/main.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- main.c 5 Aug 2007 07:31:57 -0000 1.6
+++ main.c 17 Aug 2007 09:39:18 -0000 1.7
@@ -1058,6 +1058,7 @@
return (int)(((unsigned int)r1 << 16) | ((unsigned int)r2));
}
+#ifndef _WIN32
double
get_time(void)
{
@@ -1066,6 +1067,13 @@
gettimeofday(&timev, NULL);
return (double)timev.tv_sec + (((double)timev.tv_usec) / 1000000);
}
+#else
+double
+get_time(void)
+{
+ return (double)GetTickCount()/1000.0;
+}
+#endif
int
engine_abort(void)
@@ -1104,6 +1112,8 @@
loop_func = engine_software_ddraw_loop;
if (engine_software_sdl_args(argc, argv))
loop_func = engine_software_sdl_loop;
+ if (engine_direct3d_args(argc, argv))
+ loop_func = engine_direct3d_loop;
if (!loop_func)
{
fprintf(stderr,
@@ -1113,7 +1123,7 @@
" -e ENGINE\n"
"\n"
"Where ENGINE can be one of:\n"
- " x11 xr gl-glew gl x11-16 ddraw sdl\n"
+ " x11 xr gl-glew gl x11-16 ddraw direct3d sdl\n"
);
exit(-1);
}
===================================================================
RCS file: /cvs/e/e17/apps/expedite/src/bin/main.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- main.h 5 Aug 2007 07:31:57 -0000 1.5
+++ main.h 17 Aug 2007 09:39:18 -0000 1.6
@@ -8,6 +8,10 @@
#include <sys/time.h>
#include <time.h>
+#ifdef _WIN32
+# include <windows.h>
+#endif
+
#include <Evas.h>
#include "config.h"
#include "engine_software_x11.h"
@@ -17,6 +21,7 @@
#include "engine_software_16_x11.h"
#include "engine_software_ddraw.h"
#include "engine_software_sdl.h"
+#include "engine_direct3d.h"
#include "ui.h"
#include "about.h"
-------------------------------------------------------------------------
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
