Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-12-01 11:50:43 +00:00
Code Issues Projects Releases Wiki Activity

Fix CrossPlatform files for SheepShaver build and a warning.

Browse Source
This commit is contained in:
Alexei Svitkine 2015-12-26 02:17:08 -05:00
parent 934fbca480
commit db375713bb
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BasiliskII/src/CrossPlatform/sigsegv.cpp
View File

@ -71,9 +71,10 @@ static sigsegv_fault_handler_t sigsegv_fault_handler = 0;
// Function called to dump state if we can't handle the fault // Function called to dump state if we can't handle the fault
static sigsegv_state_dumper_t sigsegv_state_dumper = 0; static sigsegv_state_dumper_t sigsegv_state_dumper = 0;
#if defined(HAVE_SIGINFO_T) || defined(HAVE_SIGCONTEXT_SUBTERFUGE)
// Actual SIGSEGV handler installer // Actual SIGSEGV handler installer
static bool sigsegv_do_install_handler(int sig); static bool sigsegv_do_install_handler(int sig);
#endif
/* /*
* Instruction decoding aids * Instruction decoding aids

11
SheepShaver/src/Unix/Makefile.in
View File

@ -17,7 +17,7 @@ CC = @CC@
CXX = @CXX@ CXX = @CXX@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
CXXFLAGS = @CXXFLAGS@ CXXFLAGS = @CXXFLAGS@
CPPFLAGS = @CPPFLAGS@ -I../include -I. -I../slirp CPPFLAGS = @CPPFLAGS@ -I../include -I. -I../CrossPlatform -I../slirp
DEFS = @DEFS@ -D_REENTRANT -DDATADIR=\"$(datadir)/$(APP)\" DEFS = @DEFS@ -D_REENTRANT -DDATADIR=\"$(datadir)/$(APP)\"
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
@ -49,6 +49,8 @@ GUI_SRCS = ../prefs.cpp prefs_unix.cpp prefs_editor_gtk.cpp ../prefs_items.cpp \
../user_strings.cpp user_strings_unix.cpp xpram_unix.cpp sys_unix.cpp rpc_unix.cpp \ ../user_strings.cpp user_strings_unix.cpp xpram_unix.cpp sys_unix.cpp rpc_unix.cpp \
../dummy/prefs_dummy.cpp ../dummy/prefs_dummy.cpp
XPLAT_SRCS = ../CrossPlatform/vm_alloc.cpp ../CrossPlatform/sigsegv.cpp ../CrossPlatform/video_blit.cpp
# Append disassembler to dyngen, if available # Append disassembler to dyngen, if available
ifneq (:no,$(MONSRCS):$(USE_DYNGEN)) ifneq (:no,$(MONSRCS):$(USE_DYNGEN))
DYNGENSRCS += $(filter %i386-dis.c,$(MONSRCS)) DYNGENSRCS += $(filter %i386-dis.c,$(MONSRCS))
@ -59,11 +61,10 @@ SRCS = ../main.cpp main_unix.cpp ../prefs.cpp ../prefs_items.cpp prefs_unix.cpp
../rom_patches.cpp ../rsrc_patches.cpp ../emul_op.cpp ../name_registry.cpp \ ../rom_patches.cpp ../rsrc_patches.cpp ../emul_op.cpp ../name_registry.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 ../audio.cpp ../ether.cpp ../thunks.cpp \
../serial.cpp ../extfs.cpp disk_sparsebundle.cpp tinyxml2.cpp \ ../serial.cpp ../extfs.cpp disk_sparsebundle.cpp tinyxml2.cpp \
about_window_unix.cpp ../user_strings.cpp user_strings_unix.cpp \ about_window_unix.cpp ../user_strings.cpp user_strings_unix.cpp rpc_unix.cpp \
vm_alloc.cpp sigsegv.cpp rpc_unix.cpp \ sshpty.c strlcpy.c $(XPLAT_SRCS) $(SYSSRCS) $(CPUSRCS) $(MONSRCS) $(SLIRP_SRCS)
sshpty.c strlcpy.c $(SYSSRCS) $(CPUSRCS) $(MONSRCS) $(SLIRP_SRCS)
APP = SheepShaver APP = SheepShaver
APP_EXE = $(APP)$(EXEEXT) APP_EXE = $(APP)$(EXEEXT)
APP_APP = $(APP).app APP_APP = $(APP).app