From: Michael D. <mic...@gm...> - 2005-07-04 16:10:49
|
> Can you check current CVS? I have committed the new paranoia > checks. Please, cvs update -d in both BasiliskII and SheepShaver > directories. Then, in the SheepShaver/ directory, > find . -type l | xargs rm -f (remove all symlinks in the > SheepShaver tree). > make links (recreate the symlinks) I just deleted the SheepShaver and BasiliskII folders and started completely fresh and I got the following linking error (I'm probably just doing something stupid because I remember being able to get around some of these before): g++ -o SheepShaver -pagezero_size 0x3000 obj/main.o obj/ main_unix.o obj/prefs.o obj/prefs_items.o obj/prefs_unix.o obj/ sys_unix.o obj/rom_patches.o obj/rsrc_patches.o obj/emul_op.o obj/ name_registry.o obj/macos_util.o obj/timer.o obj/timer_unix.o obj/ xpram.o obj/xpram_unix.o obj/adb.o obj/sony.o obj/disk.o obj/cdrom.o obj/scsi.o obj/gfxaccel.o obj/video.o obj/video_blit.o obj/audio.o obj/ether.o obj/thunks.o obj/serial.o obj/extfs.o obj/ about_window_unix.o obj/user_strings.o obj/user_strings_unix.o obj/ vm_alloc.o obj/sigsegv.o obj/sshpty.o obj/strlcpy.o obj/video_sdl.o obj/extfs_macosx.o obj/serial_unix.o obj/ether_unix.o obj/ scsi_dummy.o obj/audio_sdl.o obj/prefs_editor_dummy.o obj/paranoia.o obj/ppc_asm.o obj/sys_darwin.o obj/clip_macosx.o obj/bootp.o obj/ ip_output.o obj/tcp_input.o obj/cksum.o obj/mbuf.o obj/tcp_output.o obj/debug.o obj/misc.o obj/tcp_subr.o obj/if.o obj/sbuf.o obj/ tcp_timer.o obj/ip_icmp.o obj/slirp.o obj/tftp.o obj/ip_input.o obj/ socket.o obj/udp.o -lpthread -L/sw/lib -lSDLmain -lSDL -framework Cocoa -framework OpenGL -framework Carbon -framework IOKit /usr/bin/ld: multiple definitions of symbol _sigusr2_handler obj/main_unix.o definition of _sigusr2_handler in section (__TEXT,__text) obj/paranoia.o definition of _sigusr2_handler in section (__TEXT,__text) collect2: ld returned 1 exit status make: *** [SheepShaver] Error 1 > The reason is some files moved around and were added, namely for > slirp support in SheepShaver. aka. user-mode network emulation, > even under MacOS X. ;-) > Great!!! Thanks for all your work! -Michael |