summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS2
-rw-r--r--configure.in13
-rw-r--r--src/bin/Makefile.am13
-rw-r--r--src/bin/main.c8
-rw-r--r--src/bin/main.h3
5 files changed, 35 insertions, 4 deletions
diff --git a/AUTHORS b/AUTHORS
index 7bf31c1..1694b5f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,2 +1,2 @@
1The Rasterman (Carsten Haitzler) <raster@rasterman.com> 1The Rasterman (Carsten Haitzler) <raster@rasterman.com>
2 2Tim Horton <hortont424@gmail.com>
diff --git a/configure.in b/configure.in
index 9a886d4..832e2b2 100644
--- a/configure.in
+++ b/configure.in
@@ -13,6 +13,12 @@ AM_INIT_AUTOMAKE(1.6 dist-bzip2)
13AM_CONFIG_HEADER(config.h) 13AM_CONFIG_HEADER(config.h)
14 14
15AC_ISC_POSIX 15AC_ISC_POSIX
16m4_ifdef([AC_PROG_OBJC],
17 [AC_PROG_OBJC],
18 [AC_CHECK_TOOL([OBJC], [gcc])
19 AC_SUBST([OBJC])
20 AC_SUBST([OBJCFLAGS])
21 ])
16AC_PROG_CXX 22AC_PROG_CXX
17AC_PROG_CC 23AC_PROG_CC
18AM_PROG_CC_STDC 24AM_PROG_CC_STDC
@@ -73,6 +79,9 @@ EXPEDITE_CHECK_ENGINE([fb], [Framebuffer], "yes")
73### DIRECTFB 79### DIRECTFB
74EXPEDITE_CHECK_ENGINE([directfb], [DirectFB], "yes") 80EXPEDITE_CHECK_ENGINE([directfb], [DirectFB], "yes")
75 81
82### Quartz
83EXPEDITE_CHECK_ENGINE([quartz], [Quartz], "yes", [quartz_libs="-framework Cocoa -framework ApplicationServices"])
84
76### Software 16bit X11 85### Software 16bit X11
77EXPEDITE_CHECK_ENGINE([software-16-x11], [Software 16 bits X11], "yes") 86EXPEDITE_CHECK_ENGINE([software-16-x11], [Software 16 bits X11], "yes")
78 87
@@ -123,6 +132,8 @@ if test "x$have_directfb" = "xyes"; then
123fi 132fi
124AM_CONDITIONAL(BUILD_DIRECTFB, test "x$have_directfb" = "xyes") 133AM_CONDITIONAL(BUILD_DIRECTFB, test "x$have_directfb" = "xyes")
125 134
135AM_CONDITIONAL(BUILD_QUARTZ, test "x$have_quartz" = "xyes")
136
126AC_SUBST(x_cflags) 137AC_SUBST(x_cflags)
127AC_SUBST(x_libs) 138AC_SUBST(x_libs)
128AC_SUBST(ddraw_libs) 139AC_SUBST(ddraw_libs)
@@ -130,6 +141,7 @@ AC_SUBST(ddraw_16_libs)
130AC_SUBST(d3d_libs) 141AC_SUBST(d3d_libs)
131AC_SUBST(wince_16_libs) 142AC_SUBST(wince_16_libs)
132AC_SUBST(glew_libs) 143AC_SUBST(glew_libs)
144AC_SUBST(quartz_libs)
133 145
134AC_OUTPUT([ 146AC_OUTPUT([
135Makefile 147Makefile
@@ -152,6 +164,7 @@ echo " Open GL Glew.................: ${have_opengl_glew}"
152echo " Software SDL.................: ${have_software_sdl}" 164echo " Software SDL.................: ${have_software_sdl}"
153echo " FB...........................: ${have_fb}" 165echo " FB...........................: ${have_fb}"
154echo " DirectFB.....................: ${have_directfb}" 166echo " DirectFB.....................: ${have_directfb}"
167echo " Quartz.......................: ${have_quartz}"
155echo " Software X11 16 bits.........: ${have_software_16_x11}" 168echo " Software X11 16 bits.........: ${have_software_16_x11}"
156echo " Software DirectDraw 16 bits..: ${have_software_16_ddraw}" 169echo " Software DirectDraw 16 bits..: ${have_software_16_ddraw}"
157echo " Software WinCE 16 bits.......: ${have_software_16_wince}" 170echo " Software WinCE 16 bits.......: ${have_software_16_wince}"
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 394eb28..3b911b3 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -59,7 +59,7 @@ image_blend_occlude3_very_many.c \
59poly_blend.c 59poly_blend.c
60 60
61expedite_CFLAGS = @WIN32_CFLAGS@ 61expedite_CFLAGS = @WIN32_CFLAGS@
62expedite_LDADD = @EVAS_LIBS@ @SDL_LIBS@ @x_libs@ @ddraw_libs@ @ddraw_16_libs@ @d3d_libs@ @wince_16_libs@ @glew_libs@ @DIRECTFB_LIBS@ @XCB_LIBS@ -lm 62expedite_LDADD = @EVAS_LIBS@ @SDL_LIBS@ @x_libs@ @ddraw_libs@ @ddraw_16_libs@ @d3d_libs@ @wince_16_libs@ @glew_libs@ @DIRECTFB_LIBS@ @XCB_LIBS@ @quartz_libs@ -lm
63expedite_LDFLAGS = @lt_enable_auto_import@ 63expedite_LDFLAGS = @lt_enable_auto_import@
64 64
65if BUILD_SOFTWARE_X11 65if BUILD_SOFTWARE_X11
@@ -112,6 +112,16 @@ expedite_SOURCES += \
112engine_directfb.c engine_directfb.h 112engine_directfb.c engine_directfb.h
113endif 113endif
114 114
115if BUILD_QUARTZ
116expedite_SOURCES += \
117engine_quartz.h
118
119### add to SOURCES one we know how to fix:
120# /usr/share/automake-1.9/am/depend2.am: am__fastdepOBJC does not appear in
121# AM_CONDITIONAL
122# engine_quartz.m
123endif
124
115if BUILD_SOFTWARE_16_X11 125if BUILD_SOFTWARE_16_X11
116expedite_SOURCES += \ 126expedite_SOURCES += \
117engine_software_16_x11.c engine_software_16_x11.h 127engine_software_16_x11.c engine_software_16_x11.h
@@ -126,4 +136,3 @@ if BUILD_SOFTWARE_16_WINCE
126expedite_SOURCES += \ 136expedite_SOURCES += \
127engine_software_16_wince.c engine_software_16_wince.h 137engine_software_16_wince.c engine_software_16_wince.h
128endif 138endif
129
diff --git a/src/bin/main.c b/src/bin/main.c
index e174a47..1d31bd5 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -1125,7 +1125,6 @@ build_path(const char *filename)
1125int 1125int
1126engine_abort(void) 1126engine_abort(void)
1127{ 1127{
1128 fprintf(stderr, "go: %i\n", go);
1129 go = 0; 1128 go = 0;
1130 return go; 1129 return go;
1131} 1130}
@@ -1240,6 +1239,10 @@ _engine_args(int argc, char **argv)
1240 if (engine_directfb_args(argc, argv)) 1239 if (engine_directfb_args(argc, argv))
1241 loop_func = engine_directfb_loop; 1240 loop_func = engine_directfb_loop;
1242#endif 1241#endif
1242#if HAVE_EVAS_QUARTZ
1243 if (engine_quartz_args(argc, argv))
1244 loop_func = engine_quartz_loop;
1245#endif
1243#if HAVE_EVAS_SOFTWARE_16_X11 1246#if HAVE_EVAS_SOFTWARE_16_X11
1244 if (engine_software_16_x11_args(argc, argv)) 1247 if (engine_software_16_x11_args(argc, argv))
1245 loop_func = engine_software_16_x11_loop; 1248 loop_func = engine_software_16_x11_loop;
@@ -1283,6 +1286,9 @@ _engine_args(int argc, char **argv)
1283#if HAVE_EVAS_DIRECT3D 1286#if HAVE_EVAS_DIRECT3D
1284 " direct3d" 1287 " direct3d"
1285#endif 1288#endif
1289#if HAVE_EVAS_QUARTZ
1290 " quartz"
1291#endif
1286#if HAVE_EVAS_OPENGL_GLEW 1292#if HAVE_EVAS_OPENGL_GLEW
1287 " gl-glew" 1293 " gl-glew"
1288#endif 1294#endif
diff --git a/src/bin/main.h b/src/bin/main.h
index 69b58bb..351920a 100644
--- a/src/bin/main.h
+++ b/src/bin/main.h
@@ -47,6 +47,9 @@
47#if HAVE_EVAS_DIRECTFB 47#if HAVE_EVAS_DIRECTFB
48#include "engine_directfb.h" 48#include "engine_directfb.h"
49#endif 49#endif
50#if HAVE_EVAS_QUARTZ
51#include "engine_quartz.h"
52#endif
50#if HAVE_EVAS_SOFTWARE_16_X11 53#if HAVE_EVAS_SOFTWARE_16_X11
51#include "engine_software_16_x11.h" 54#include "engine_software_16_x11.h"
52#endif 55#endif