Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2025-08-09 03:25:04 +00:00
Code Issues Projects Releases Wiki Activity

Fix build on MacOS X: dedicated extfs_macosx.mm & static SDL libs

Browse Source
This commit is contained in:
gbeauche
2005-05-13 17:32:13 +00:00
parent fdfcd3eb86
commit d9839e7079
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BasiliskII/src/Unix/Makefile.in
View File

@@ -47,7 +47,7 @@ SRCS = ../main.cpp main_unix.cpp ../prefs.cpp ../prefs_items.cpp prefs_unix.cpp
../emul_op.cpp ../macos_util.cpp ../xpram.cpp xpram_unix.cpp ../timer.cpp \
timer_unix.cpp ../adb.cpp ../serial.cpp ../ether.cpp \
../sony.cpp ../disk.cpp ../cdrom.cpp ../scsi.cpp ../video.cpp video_blit.cpp \
vm_alloc.cpp sigsegv.cpp ../audio.cpp ../extfs.cpp extfs_unix.cpp \
vm_alloc.cpp sigsegv.cpp ../audio.cpp ../extfs.cpp \
../user_strings.cpp user_strings_unix.cpp sshpty.c strlcpy.c \
$(SYSSRCS) $(CPUSRCS) $(SLIRP_SRCS)
APP = BasiliskII

13
BasiliskII/src/Unix/configure.ac
View File

@@ -21,6 +21,7 @@ AC_ARG_ENABLE(fbdev-dga, [ --enable-fbdev-dga use direct frame buffer
AC_ARG_ENABLE(vosf, [ --enable-vosf enable video on SEGV signals [default=yes]], [WANT_VOSF=$enableval], [WANT_VOSF=yes])
dnl SDL options.
AC_ARG_ENABLE(sdl-static, [ --enable-sdl-static use SDL static libraries for linking [default=no]], [WANT_SDL_STATIC=$enableval], [WANT_SDL_STATIC=no])
AC_ARG_ENABLE(sdl-video, [ --enable-sdl-video use SDL for video graphics [default=no]], [WANT_SDL_VIDEO=$enableval], [WANT_SDL_VIDEO=no])
AC_ARG_ENABLE(sdl-audio, [ --enable-sdl-audio use SDL for audio [default=no]], [WANT_SDL_AUDIO=$enableval], [WANT_SDL_AUDIO=no])
@@ -153,7 +154,11 @@ if [[ "x$WANT_SDL" = "xyes" ]]; then
;;
*)
sdl_cflags=`$sdl_config --cflags`
sdl_libs=`$sdl_config --libs`
if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
sdl_libs=`$sdl_config --static-libs`
else
sdl_libs=`$sdl_config --libs`
fi
;;
esac
CFLAGS="$CFLAGS $sdl_cflags"
@@ -406,6 +411,7 @@ SERIALSRC=serial_unix.cpp
ETHERSRC=../dummy/ether_dummy.cpp
SCSISRC=../dummy/scsi_dummy.cpp
AUDIOSRC=../dummy/audio_dummy.cpp
EXTFSSRC=extfs_unix.cpp
EXTRASYSSRCS=
CAN_NATIVE_M68K=no
case "$target_os" in
@@ -466,6 +472,9 @@ darwin*)
if [[ "x$ac_cv_framework_IOKit" = "xyes" ]]; then
EXTRASYSSRCS="../MacOSX/sys_darwin.cpp"
fi
if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
EXTFSSRC=../MacOSX/extfs_macosx.mm
fi
;;
cygwin*)
SERIALSRC="../dummy/serial_dummy.cpp"
@@ -516,7 +525,7 @@ if [[ "x$HAVE_PTHREADS" = "xno" ]]; then
ETHERSRC=../dummy/ether_dummy.cpp
AUDIOSRC=../dummy/audio_dummy.cpp
fi
SYSSRCS="$VIDEOSRCS $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
SYSSRCS="$VIDEOSRCS $EXTFSSRC $SERIALSRC $ETHERSRC $SCSISRC $AUDIOSRC $SEMSRC $UISRCS $MONSRCS $EXTRASYSSRCS"
dnl Define a macro that translates a yesno-variable into a C macro definition
dnl to be put into the config.h file