mirror of
https://github.com/kanjitalk755/macemu.git
synced 2024-09-15 06:56:46 +00:00
Use Nigel's "extfs" implementation on MacOS X
This commit is contained in:
parent
b60874907e
commit
c1c16e9997
@ -65,7 +65,9 @@ links:
|
|||||||
Unix/Darwin/lowmem.c Unix/Darwin/pagezero.c Unix/Darwin/testlmem.sh \
|
Unix/Darwin/lowmem.c Unix/Darwin/pagezero.c Unix/Darwin/testlmem.sh \
|
||||||
dummy/audio_dummy.cpp dummy/clip_dummy.cpp \
|
dummy/audio_dummy.cpp dummy/clip_dummy.cpp \
|
||||||
dummy/prefs_editor_dummy.cpp dummy/scsi_dummy.cpp SDL \
|
dummy/prefs_editor_dummy.cpp dummy/scsi_dummy.cpp SDL \
|
||||||
MacOSX/sys_darwin.cpp MacOSX/clip_macosx.cpp'; \
|
MacOSX/sys_darwin.cpp MacOSX/clip_macosx.cpp \
|
||||||
|
MacOSX/macos_util_macosx.h MacOSX/extfs_macosx.h \
|
||||||
|
MacOSX/extfs_macosx.mm'; \
|
||||||
PREFIX="`pwd`/"; case $(B2_TOPDIR) in /*) PREFIX="";; esac; \
|
PREFIX="`pwd`/"; case $(B2_TOPDIR) in /*) PREFIX="";; esac; \
|
||||||
for i in $$list; do \
|
for i in $$list; do \
|
||||||
echo $$i; \
|
echo $$i; \
|
||||||
|
@ -38,7 +38,7 @@ SRCS = main_unix.cpp ../prefs.cpp ../prefs_items.cpp prefs_unix.cpp sys_unix.cpp
|
|||||||
../macos_util.cpp ../timer.cpp timer_unix.cpp ../xpram.cpp xpram_unix.cpp \
|
../macos_util.cpp ../timer.cpp timer_unix.cpp ../xpram.cpp xpram_unix.cpp \
|
||||||
../adb.cpp ../sony.cpp ../disk.cpp ../cdrom.cpp ../scsi.cpp \
|
../adb.cpp ../sony.cpp ../disk.cpp ../cdrom.cpp ../scsi.cpp \
|
||||||
../gfxaccel.cpp ../video.cpp video_blit.cpp ../audio.cpp ../ether.cpp ../thunks.cpp \
|
../gfxaccel.cpp ../video.cpp video_blit.cpp ../audio.cpp ../ether.cpp ../thunks.cpp \
|
||||||
../serial.cpp ../extfs.cpp extfs_unix.cpp \
|
../serial.cpp ../extfs.cpp \
|
||||||
about_window_unix.cpp ../user_strings.cpp user_strings_unix.cpp \
|
about_window_unix.cpp ../user_strings.cpp user_strings_unix.cpp \
|
||||||
vm_alloc.cpp sigsegv.cpp \
|
vm_alloc.cpp sigsegv.cpp \
|
||||||
sshpty.c strlcpy.c $(SYSSRCS) $(CPUSRCS)
|
sshpty.c strlcpy.c $(SYSSRCS) $(CPUSRCS)
|
||||||
@ -124,6 +124,8 @@ $(OBJ_DIR)/%.o : %.c
|
|||||||
$(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c $< -o $@
|
$(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c $< -o $@
|
||||||
$(OBJ_DIR)/%.o : %.cpp
|
$(OBJ_DIR)/%.o : %.cpp
|
||||||
$(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c $< -o $@
|
$(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c $< -o $@
|
||||||
|
$(OBJ_DIR)/%.o : %.mm
|
||||||
|
$(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c $< -o $@
|
||||||
$(OBJ_DIR)/%.o : %.S
|
$(OBJ_DIR)/%.o : %.S
|
||||||
$(CPP) $(CPPFLAGS) -D__ASSEMBLY__ $< -o $*.s
|
$(CPP) $(CPPFLAGS) -D__ASSEMBLY__ $< -o $*.s
|
||||||
$(AS) $(ASFLAGS) -o $@ $*.s
|
$(AS) $(ASFLAGS) -o $@ $*.s
|
||||||
|
@ -314,6 +314,7 @@ SERIALSRC=serial_unix.cpp
|
|||||||
ETHERSRC=../dummy/ether_dummy.cpp
|
ETHERSRC=../dummy/ether_dummy.cpp
|
||||||
SCSISRC=../dummy/scsi_dummy.cpp
|
SCSISRC=../dummy/scsi_dummy.cpp
|
||||||
AUDIOSRC=../dummy/audio_dummy.cpp
|
AUDIOSRC=../dummy/audio_dummy.cpp
|
||||||
|
EXTFSSRC=extfs_unix.cpp
|
||||||
EXTRASYSSRCS=
|
EXTRASYSSRCS=
|
||||||
case "$target_os" in
|
case "$target_os" in
|
||||||
linux*)
|
linux*)
|
||||||
@ -331,6 +332,9 @@ darwin*)
|
|||||||
if [[ "x$ac_cv_framework_IOKit" = "xyes" ]]; then
|
if [[ "x$ac_cv_framework_IOKit" = "xyes" ]]; then
|
||||||
EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/sys_darwin.cpp"
|
EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/sys_darwin.cpp"
|
||||||
fi
|
fi
|
||||||
|
if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
|
||||||
|
EXTFSSRC=../MacOSX/extfs_macosx.mm
|
||||||
|
fi
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
@ -353,7 +357,7 @@ else
|
|||||||
EXTRASYSSRCS="$EXTRASYSSRCS clip_unix.cpp"
|
EXTRASYSSRCS="$EXTRASYSSRCS clip_unix.cpp"
|
||||||
fi
|
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 Define a macro that translates a yesno-variable into a C macro definition
|
||||||
dnl to be put into the config.h file
|
dnl to be put into the config.h file
|
||||||
|
Loading…
Reference in New Issue
Block a user