tim horton's expedite quartz engine patches

SVN revision: 36108
expedite-1.1
Carsten Haitzler 14 years ago
parent e7dbbf1e4e
commit 745377bbba
  1. 2
      AUTHORS
  2. 13
      configure.in
  3. 13
      src/bin/Makefile.am
  4. 8
      src/bin/main.c
  5. 3
      src/bin/main.h

@ -1,2 +1,2 @@
The Rasterman (Carsten Haitzler) <raster@rasterman.com>
Tim Horton <hortont424@gmail.com>

@ -13,6 +13,12 @@ AM_INIT_AUTOMAKE(1.6 dist-bzip2)
AM_CONFIG_HEADER(config.h)
AC_ISC_POSIX
m4_ifdef([AC_PROG_OBJC],
[AC_PROG_OBJC],
[AC_CHECK_TOOL([OBJC], [gcc])
AC_SUBST([OBJC])
AC_SUBST([OBJCFLAGS])
])
AC_PROG_CXX
AC_PROG_CC
AM_PROG_CC_STDC
@ -73,6 +79,9 @@ EXPEDITE_CHECK_ENGINE([fb], [Framebuffer], "yes")
### DIRECTFB
EXPEDITE_CHECK_ENGINE([directfb], [DirectFB], "yes")
### Quartz
EXPEDITE_CHECK_ENGINE([quartz], [Quartz], "yes", [quartz_libs="-framework Cocoa -framework ApplicationServices"])
### Software 16bit X11
EXPEDITE_CHECK_ENGINE([software-16-x11], [Software 16 bits X11], "yes")
@ -123,6 +132,8 @@ if test "x$have_directfb" = "xyes"; then
fi
AM_CONDITIONAL(BUILD_DIRECTFB, test "x$have_directfb" = "xyes")
AM_CONDITIONAL(BUILD_QUARTZ, test "x$have_quartz" = "xyes")
AC_SUBST(x_cflags)
AC_SUBST(x_libs)
AC_SUBST(ddraw_libs)
@ -130,6 +141,7 @@ AC_SUBST(ddraw_16_libs)
AC_SUBST(d3d_libs)
AC_SUBST(wince_16_libs)
AC_SUBST(glew_libs)
AC_SUBST(quartz_libs)
AC_OUTPUT([
Makefile
@ -152,6 +164,7 @@ echo " Open GL Glew.................: ${have_opengl_glew}"
echo " Software SDL.................: ${have_software_sdl}"
echo " FB...........................: ${have_fb}"
echo " DirectFB.....................: ${have_directfb}"
echo " Quartz.......................: ${have_quartz}"
echo " Software X11 16 bits.........: ${have_software_16_x11}"
echo " Software DirectDraw 16 bits..: ${have_software_16_ddraw}"
echo " Software WinCE 16 bits.......: ${have_software_16_wince}"

@ -59,7 +59,7 @@ image_blend_occlude3_very_many.c \
poly_blend.c
expedite_CFLAGS = @WIN32_CFLAGS@
expedite_LDADD = @EVAS_LIBS@ @SDL_LIBS@ @x_libs@ @ddraw_libs@ @ddraw_16_libs@ @d3d_libs@ @wince_16_libs@ @glew_libs@ @DIRECTFB_LIBS@ @XCB_LIBS@ -lm
expedite_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
expedite_LDFLAGS = @lt_enable_auto_import@
if BUILD_SOFTWARE_X11
@ -112,6 +112,16 @@ expedite_SOURCES += \
engine_directfb.c engine_directfb.h
endif
if BUILD_QUARTZ
expedite_SOURCES += \
engine_quartz.h
### add to SOURCES one we know how to fix:
# /usr/share/automake-1.9/am/depend2.am: am__fastdepOBJC does not appear in
# AM_CONDITIONAL
# engine_quartz.m
endif
if BUILD_SOFTWARE_16_X11
expedite_SOURCES += \
engine_software_16_x11.c engine_software_16_x11.h
@ -126,4 +136,3 @@ if BUILD_SOFTWARE_16_WINCE
expedite_SOURCES += \
engine_software_16_wince.c engine_software_16_wince.h
endif

@ -1125,7 +1125,6 @@ build_path(const char *filename)
int
engine_abort(void)
{
fprintf(stderr, "go: %i\n", go);
go = 0;
return go;
}
@ -1240,6 +1239,10 @@ _engine_args(int argc, char **argv)
if (engine_directfb_args(argc, argv))
loop_func = engine_directfb_loop;
#endif
#if HAVE_EVAS_QUARTZ
if (engine_quartz_args(argc, argv))
loop_func = engine_quartz_loop;
#endif
#if HAVE_EVAS_SOFTWARE_16_X11
if (engine_software_16_x11_args(argc, argv))
loop_func = engine_software_16_x11_loop;
@ -1283,6 +1286,9 @@ _engine_args(int argc, char **argv)
#if HAVE_EVAS_DIRECT3D
" direct3d"
#endif
#if HAVE_EVAS_QUARTZ
" quartz"
#endif
#if HAVE_EVAS_OPENGL_GLEW
" gl-glew"
#endif

@ -47,6 +47,9 @@
#if HAVE_EVAS_DIRECTFB
#include "engine_directfb.h"
#endif
#if HAVE_EVAS_QUARTZ
#include "engine_quartz.h"
#endif
#if HAVE_EVAS_SOFTWARE_16_X11
#include "engine_software_16_x11.h"
#endif

Loading…
Cancel
Save