ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/BasiliskII/src/Unix/configure.ac

Comparing BasiliskII/src/Unix/configure.ac (file contents):
Revision 1.30 by gbeauche, 2004-06-27T22:06:02Z vs.
Revision 1.31 by gbeauche, 2004-07-19T19:25:07Z

#	Line 22 | Line 22 | AC_ARG_ENABLE(vosf,          [  --enable
22
23		dnl SDL options.
24		AC_ARG_ENABLE(sdl-video,     [  --enable-sdl-video      use SDL for video graphics [default=no]], [WANT_SDL_VIDEO=$enableval], [WANT_SDL_VIDEO=no])
25	+	AC_ARG_ENABLE(sdl-audio,     [  --enable-sdl-audio      use SDL for audio [default=no]], [WANT_SDL_AUDIO=$enableval], [WANT_SDL_AUDIO=no])
26
27		dnl JIT compiler options.
28		AC_ARG_ENABLE(jit-compiler,  [  --enable-jit-compiler   enable JIT compiler [default=no]], [WANT_JIT=$enableval], [WANT_JIT=no])
#	Line 128 | Line 129 | AC_CHECK_LIB(rt, timer_create)
129
130		dnl Do we need SDL?
131		WANT_SDL=no
131	–	SDL_SUPPORT="none"
132		if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
133		WANT_SDL=yes
134		WANT_XF86_DGA=no
135		WANT_XF86_VIDMODE=no
136		WANT_FBDEV_DGA=no
137	<	SDL_SUPPORT="video"
137	>	SDL_SUPPORT="$SDL_SUPPORT video"
138	>	fi
139	>	if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; then
140	>	WANT_SDL=yes
141	>	SDL_SUPPORT="$SDL_SUPPORT audio"
142		fi
143		if [[ "x$WANT_SDL" = "xyes" ]]; then
144		AC_PATH_PROG(sdl_config, "sdl-config")
#	Line 147 | Line 151 | if [[ "x$WANT_SDL" = "xyes" ]]; then
151		else
152		WANT_SDL=no
153		fi
154	+	SDL_SUPPORT=`echo "$SDL_SUPPORT" | sed -e "s/^ //"`
155	+	else
156	+	SDL_SUPPORT="none"
157		fi
158
159		dnl We need X11, if not using SDL.
#	Line 445 | Line 452 | if [[ "x$WANT_SDL" = "xyes" ]]; then
452		AC_DEFINE(USE_SDL, 1, [Define to enble SDL support])
453		fi
454		if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
448	–	VIDEOSRCS="../SDL/video_sdl.cpp"
455		AC_DEFINE(USE_SDL_VIDEO, 1, [Define to enable SDL video graphics support])
456	+	VIDEOSRCS="../SDL/video_sdl.cpp"
457		KEYCODES="../SDL/keycodes"
458		if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
459		EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/clip_macosx.cpp"
#	Line 458 | Line 465 | else
465		KEYCODES="keycodes"
466		EXTRASYSSRCS="$EXTRASYSSRCS clip_unix.cpp"
467		fi
468	+	if [[ "x$WANT_SDL_AUDIO" = "xyes" ]]; then
469	+	AC_DEFINE(USE_SDL_AUDIO, 1, [Define to enable SDL audio support])
470	+	AUDIOSRC="../SDL/audio_sdl.cpp"
471	+	fi
472
473		dnl Use 68k CPU natively?
474		WANT_NATIVE_M68K=no

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines