Macintosh-Tools/executor
1
0
Fork 0
mirror of https://github.com/ctm/executor.git synced 2024-05-29 06:41:34 +00:00
Code Issues Projects Releases Wiki Activity

Intel Mac OS X version builds with GNU build system.

Browse Source
This commit is contained in:
Clifford Matthews 2009-06-21 22:45:51 -06:00
parent 3374007809
commit 8b79043983
3 changed files with 48 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/Makefile.am
View File

@ -158,11 +158,17 @@ src-blitters-stamp src-blitters.h src-blitters.s: \
$(RM) opfind
touch src-blitters-stamp
arch_sources = config/arch/i386/x86patblt.S \
config/arch/i386/x86srcblt.S \
config/arch/i386/xdstubtables.c \
config/arch/i386/sbstubtables.c \
config/arch/i386/i386.c
arch_sources = config/arch/i386/i386.c
if !CONFIG_OS_MACOSX
arch_sources += config/arch/i386/x86patblt.S \
config/arch/i386/x86srcblt.S \
config/arch/i386/xdstubtables.c \
config/arch/i386/sbstubtables.c
endif !CONFIG_OS_MACOSX
endif CONFIG_ARCH_I386
@ -246,9 +252,17 @@ front_end_sources = config/front-ends/sdl/SDL_bmp.c \
config/front-ends/sdl/sdlscrap.c \
config/front-ends/sdl/sdlwin.c \
config/front-ends/sdl/sdlwm.c \
config/front-ends/sdl/sdlX.c \
config/front-ends/sdl/syswm_map.c \
config/front-ends/sdl/winmain.c
if CONFIG_OS_LINUX
front_end_sources += config/front-ends/sdl/sdlX.c
endif CONFIG_OS_LINUX
if CONFIG_OS_MACOSX
front_end_sources += config/front-ends/sdl/macosx_main.m
endif CONFIG_OS_MACOSX
endif CONFIG_FRONT_END_SDL
if CONFIG_FRONT_END_SVGALIB
@ -317,6 +331,10 @@ os_sources = config/os/linux/linux.c \
config/os/linux/lowglobals-mem.c
endif CONFIG_OS_LINUX
if CONFIG_OS_MACOSX
executor_LDFLAGS = -framework SDL -framework Cocoa
endif CONFIG_OS_MACOSX
if CONFIG_OS_MSDOS
os_sources = config/os/msdos/msdos.c \
config/os/msdos/dpmimem.c \

2
src/TODO
View File

@ -3,8 +3,6 @@
can clean up a bunch of repeated partial paths by making
things like archdir=config/arch/$host_arch
figure out how to deal with -framework for mac os x port
See if there's a more elegant solution to the blitters
code (can we nuke the config/arch/i386 prefixes in the
dependencies? should we make it so both source and pattern

39
src/configure.ac
View File

@ -5,21 +5,6 @@ AM_INIT_AUTOMAKE([-Wall])
AC_CONFIG_SRCDIR([executor.c])
AC_CONFIG_HEADERS([config.h])
# Checks for programs.
AM_PROG_AS
AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_RANLIB
AM_PROG_AS
AC_PROG_YACC
AC_CHECK_PROG([PERL], [perl], [perl])
AC_ARG_VAR([PERL], [perl for generating blitters])
AC_GNU_SOURCE
AC_SYS_LARGEFILE
# Normalize to our old names
case ${build_cpu} in
@ -52,6 +37,26 @@ case ${host_os} in
;;
esac
# Checks for programs.
AM_PROG_AS
AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_RANLIB
AM_PROG_AS
AC_PROG_YACC
if test x$host_os = xmacosx; then
AC_PROG_OBJC
fi
AC_CHECK_PROG([PERL], [perl], [perl])
AC_ARG_VAR([PERL], [perl for generating blitters])
AC_GNU_SOURCE
AC_SYS_LARGEFILE
# Check for libraries
if test x$host_cpu != xm68k; then
@ -69,6 +74,8 @@ AC_ARG_WITH(front-end,
front_end=sdl
elif test x"$ac_cv_lib_X11_XInitThreads" = xyes; then
front_end=x
elif test x$host_os = xmacosx; then
front_end=sdl
else
AC_MSG_ERROR([Must use --with-front-end=sdl or --with-front-end=x])
fi])
@ -89,6 +96,8 @@ AC_ARG_WITH(sound,
sound_config=sdl
elif test x"$host_os" = xxlinux; then
sound_config=linux
elif test x$host_os = xmacosx; then
sound_config=sdl
else
AC_MSG_ERROR([Must use --with-sound=sdl or --with-sound=x])
fi])