mirror of
https://github.com/kanjitalk755/macemu.git
synced 2024-09-05 19:28:58 +00:00
Fix for OS X build under x-windows. Separated out sound option.
This commit is contained in:
parent
0231906d6d
commit
a421d35b9d
@ -167,7 +167,8 @@ mostlyclean:
|
|||||||
rm -f $(PROGS) $(OBJ_DIR)/* core* *.core *~ *.bak
|
rm -f $(PROGS) $(OBJ_DIR)/* core* *.core *~ *.bak
|
||||||
|
|
||||||
clean: mostlyclean
|
clean: mostlyclean
|
||||||
rm -f cpuemu.cpp cpudefs.cpp cputmp*.s cpufast*.s cpustbl.cpp cputbl.h compemu.cpp compstbl.cpp comptbl.h
|
rm -f cpuemu.cpp cpudefs.cpp cputmp*.s cpufast*.s cpustbl.cpp cputbl.h compemu.cpp compstbl.cpp comptbl.h Darwin/lowmem Darwin/pagezero
|
||||||
|
rm -rf etherslavetool.dSYM
|
||||||
|
|
||||||
distclean: clean
|
distclean: clean
|
||||||
rm -rf $(OBJ_DIR)
|
rm -rf $(OBJ_DIR)
|
||||||
|
@ -21,6 +21,9 @@ AC_ARG_ENABLE(standalone-gui,[ --enable-standalone-gui enable a standalone GUI
|
|||||||
dnl Mac OS X GUI.
|
dnl Mac OS X GUI.
|
||||||
AC_ARG_ENABLE(macosx-gui, [ --enable-macosx-gui enable Mac OS X GUI [default=no]], [WANT_MACOSX_GUI=$enableval], [WANT_MACOSX_GUI=no])
|
AC_ARG_ENABLE(macosx-gui, [ --enable-macosx-gui enable Mac OS X GUI [default=no]], [WANT_MACOSX_GUI=$enableval], [WANT_MACOSX_GUI=no])
|
||||||
|
|
||||||
|
dnl Mac OS X Sound
|
||||||
|
AC_ARG_ENABLE(macosx-sound, [ --enable-macosx-sound enable Mac OS X Sound [default=no]], [WANT_MACOSX_SOUND=$enableval], [WANT_MACOSX_SOUND=no])
|
||||||
|
|
||||||
dnl Video options.
|
dnl Video options.
|
||||||
AC_ARG_ENABLE(xf86-dga, [ --enable-xf86-dga use the XFree86 DGA extension [default=yes]], [WANT_XF86_DGA=$enableval], [WANT_XF86_DGA=yes])
|
AC_ARG_ENABLE(xf86-dga, [ --enable-xf86-dga use the XFree86 DGA extension [default=yes]], [WANT_XF86_DGA=$enableval], [WANT_XF86_DGA=yes])
|
||||||
AC_ARG_ENABLE(xf86-vidmode, [ --enable-xf86-vidmode use the XFree86 VidMode extension [default=yes]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=yes])
|
AC_ARG_ENABLE(xf86-vidmode, [ --enable-xf86-vidmode use the XFree86 VidMode extension [default=yes]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=yes])
|
||||||
@ -509,6 +512,7 @@ mips-sony-bsd|mips-sony-newsos4)
|
|||||||
;;
|
;;
|
||||||
*-*-darwin*)
|
*-*-darwin*)
|
||||||
no_dev_ptmx=1
|
no_dev_ptmx=1
|
||||||
|
LIBS="$LIBS -lstdc++"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
@ -719,11 +723,15 @@ if [[ "x$WANT_MACOSX_GUI" = "xyes" ]]; then
|
|||||||
EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/prefs_macosx.cpp"
|
EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/prefs_macosx.cpp"
|
||||||
|
|
||||||
VIDEOSRCS="../MacOSX/video_macosx.mm"
|
VIDEOSRCS="../MacOSX/video_macosx.mm"
|
||||||
AUDIOSRC="../MacOSX/audio_macosx.cpp ../MacOSX/AudioBackEnd.cpp ../MacOSX/AudioDevice.cpp ../MacOSX/MacOSX_sound_if.cpp"
|
|
||||||
else
|
else
|
||||||
EXTRASYSSRCS="$EXTRASYSSRCS main_unix.cpp prefs_unix.cpp"
|
EXTRASYSSRCS="$EXTRASYSSRCS main_unix.cpp prefs_unix.cpp"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ "x$WANT_MACOSX_SOUND" = "xyes" ]]; then
|
||||||
|
AUDIOSRC="../MacOSX/audio_macosx.cpp ../MacOSX/AudioBackEnd.cpp ../MacOSX/AudioDevice.cpp ../MacOSX/MacOSX_sound_if.cpp"
|
||||||
|
LIBS="$LIBS -framework AudioToolbox -framework AudioUnit -framework CoreAudio"
|
||||||
|
fi
|
||||||
|
|
||||||
dnl SDL overrides
|
dnl SDL overrides
|
||||||
if [[ "x$WANT_SDL" = "xyes" ]]; then
|
if [[ "x$WANT_SDL" = "xyes" ]]; then
|
||||||
AC_DEFINE(USE_SDL, 1, [Define to enble SDL support])
|
AC_DEFINE(USE_SDL, 1, [Define to enble SDL support])
|
||||||
@ -1748,6 +1756,7 @@ echo
|
|||||||
echo Basilisk II configuration summary:
|
echo Basilisk II configuration summary:
|
||||||
echo
|
echo
|
||||||
echo Mac OS X GUI ........................... : $WANT_MACOSX_GUI
|
echo Mac OS X GUI ........................... : $WANT_MACOSX_GUI
|
||||||
|
echo Mac OS X Sound ......................... : $WANT_MACOSX_SOUND
|
||||||
echo SDL support ............................ : $SDL_SUPPORT
|
echo SDL support ............................ : $SDL_SUPPORT
|
||||||
echo BINCUE support ......................... : $have_bincue
|
echo BINCUE support ......................... : $have_bincue
|
||||||
echo LIBVHD support ......................... : $have_libvhd
|
echo LIBVHD support ......................... : $have_libvhd
|
||||||
|
Loading…
Reference in New Issue
Block a user