From a421d35b9d0e15a53102b86353a59c8bbb03e364 Mon Sep 17 00:00:00 2001 From: Dan Sumorok Date: Tue, 30 Apr 2013 20:41:50 -0400 Subject: [PATCH 1/3] Fix for OS X build under x-windows. Separated out sound option. --- BasiliskII/src/Unix/Makefile.in | 3 ++- BasiliskII/src/Unix/configure.ac | 11 ++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/BasiliskII/src/Unix/Makefile.in b/BasiliskII/src/Unix/Makefile.in index e50326a8..4b653b76 100644 --- a/BasiliskII/src/Unix/Makefile.in +++ b/BasiliskII/src/Unix/Makefile.in @@ -167,7 +167,8 @@ mostlyclean: rm -f $(PROGS) $(OBJ_DIR)/* core* *.core *~ *.bak 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 rm -rf $(OBJ_DIR) diff --git a/BasiliskII/src/Unix/configure.ac b/BasiliskII/src/Unix/configure.ac index 62d45f57..ce09c2bb 100644 --- a/BasiliskII/src/Unix/configure.ac +++ b/BasiliskII/src/Unix/configure.ac @@ -21,6 +21,9 @@ AC_ARG_ENABLE(standalone-gui,[ --enable-standalone-gui enable a standalone 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]) +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. 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]) @@ -509,6 +512,7 @@ mips-sony-bsd|mips-sony-newsos4) ;; *-*-darwin*) no_dev_ptmx=1 + LIBS="$LIBS -lstdc++" ;; esac @@ -719,11 +723,15 @@ if [[ "x$WANT_MACOSX_GUI" = "xyes" ]]; then EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/prefs_macosx.cpp" VIDEOSRCS="../MacOSX/video_macosx.mm" - AUDIOSRC="../MacOSX/audio_macosx.cpp ../MacOSX/AudioBackEnd.cpp ../MacOSX/AudioDevice.cpp ../MacOSX/MacOSX_sound_if.cpp" else EXTRASYSSRCS="$EXTRASYSSRCS main_unix.cpp prefs_unix.cpp" 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 if [[ "x$WANT_SDL" = "xyes" ]]; then AC_DEFINE(USE_SDL, 1, [Define to enble SDL support]) @@ -1748,6 +1756,7 @@ echo echo Basilisk II configuration summary: echo echo Mac OS X GUI ........................... : $WANT_MACOSX_GUI +echo Mac OS X Sound ......................... : $WANT_MACOSX_SOUND echo SDL support ............................ : $SDL_SUPPORT echo BINCUE support ......................... : $have_bincue echo LIBVHD support ......................... : $have_libvhd From 93effd9192ff5a8cdab2e4be5886c3316a2fd9c3 Mon Sep 17 00:00:00 2001 From: Dan Sumorok Date: Wed, 1 May 2013 06:55:49 -0400 Subject: [PATCH 2/3] Darwin/lowmem and Darwin/pagezero do not need to be removed for clean. --- BasiliskII/src/Unix/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BasiliskII/src/Unix/Makefile.in b/BasiliskII/src/Unix/Makefile.in index 4b653b76..2940e645 100644 --- a/BasiliskII/src/Unix/Makefile.in +++ b/BasiliskII/src/Unix/Makefile.in @@ -167,7 +167,7 @@ mostlyclean: rm -f $(PROGS) $(OBJ_DIR)/* core* *.core *~ *.bak clean: mostlyclean - 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 -f cpuemu.cpp cpudefs.cpp cputmp*.s cpufast*.s cpustbl.cpp cputbl.h compemu.cpp compstbl.cpp comptbl.h rm -rf etherslavetool.dSYM distclean: clean From 1bc3691805c1ea118cd4feee2194a604c23dd63c Mon Sep 17 00:00:00 2001 From: Dan Sumorok Date: Sun, 5 May 2013 14:18:10 -0400 Subject: [PATCH 3/3] Removed clean rule for etherslavetool. --- BasiliskII/src/Unix/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/BasiliskII/src/Unix/Makefile.in b/BasiliskII/src/Unix/Makefile.in index 2940e645..e50326a8 100644 --- a/BasiliskII/src/Unix/Makefile.in +++ b/BasiliskII/src/Unix/Makefile.in @@ -168,7 +168,6 @@ mostlyclean: clean: mostlyclean rm -f cpuemu.cpp cpudefs.cpp cputmp*.s cpufast*.s cpustbl.cpp cputbl.h compemu.cpp compstbl.cpp comptbl.h - rm -rf etherslavetool.dSYM distclean: clean rm -rf $(OBJ_DIR)