hi, i got vim to run on haiku by removing the beos gui parts. greets philipp -- Philipp Schmid <schmidp@xxxxxxxxxxx> OpenResearch
Index: src/bin/vim/src/os_beos.c =================================================================== --- src/bin/vim/src/os_beos.c (revision 11952) +++ src/bin/vim/src/os_beos.c (working copy) @@ -85,8 +85,10 @@ { bigtime_t tmo; +#ifdef FEAT_GUI if(gui.in_use) return select(nbits, rbits, wbits, ebits, timeout); +#endif if (nbits == 0) { /* select is purely being used for delay */ Index: src/bin/vim/src/ui.c =================================================================== --- src/bin/vim/src/ui.c (revision 11952) +++ src/bin/vim/src/ui.c (working copy) @@ -1568,8 +1568,12 @@ #if defined(FEAT_GUI) || defined(FEAT_MOUSE_GPM) \ || defined(FEAT_XCLIPBOARD) || defined(VMS) \ - || defined(FEAT_SNIFF) || defined(FEAT_CLIENTSERVER) || defined(PROTO) + || defined(FEAT_SNIFF) || defined(FEAT_CLIENTSERVER) \ + || defined(PROTO) || defined(__BEOS__) /* + * add_to_input_buf is needed because of beos_select, so we compile + * in any case (with gui or without gui) + * * Add the given bytes to the input buffer * Special keys start with CSI. A real CSI must have been translated to * CSI KS_EXTRA KE_CSI. K_SPECIAL doesn't require translation. Index: src/bin/vim/src/Jamfile =================================================================== --- src/bin/vim/src/Jamfile (revision 11952) +++ src/bin/vim/src/Jamfile (working copy) @@ -5,8 +5,11 @@ # set some additional defines { - SubDirCcFlags -DHAVE_CONFIG_H -DFEAT_GUI_BEOS ; - SubDirC++Flags -DHAVE_CONFIG_H -DFEAT_GUI_BEOS ; + SubDirCcFlags -DHAVE_CONFIG_H ; + SubDirC++Flags -DHAVE_CONFIG_H ; + # we don't want to build the gui code for now + #SubDirCcFlags -DHAVE_CONFIG_H -DFEAT_GUI_BEOS ; + #SubDirC++Flags -DHAVE_CONFIG_H -DFEAT_GUI_BEOS ; } BinCommand vim : @@ -50,8 +53,9 @@ ui.c undo.c window.c - gui.c - gui_beos.cc +# we don't want to build the gui code for now +# gui.c +# gui_beos.cc pty.c os_beos.c version.c Index: makehdimage =================================================================== --- makehdimage (revision 11952) +++ makehdimage (working copy) @@ -107,7 +107,7 @@ renice rmattr addattr listdev pwd chmod chown chgrp dd \ tee md5sum catattr query lsindex mkindex roster listimage \ quit open translate setvolume waitfor uname iroster keymap \ - strace rmdir error" + strace rmdir error vim" BEOS_SYSTEM_LIB="libbe.so libstdc++.r4.so libnet.so libmedia.so \ libtranslation.so libbind.so libnetapi.so libsocket.so libdebug.so" @@ -295,7 +295,7 @@ $cp ${sPrefix}data/system/boot/Bootscript \ ${sPrefix}data/system/boot/SetupEnvironment $targetDir/beos/system/boot/ $cp ${sPrefix}data/etc/profile ${sPrefix}data/etc/termcap $targetDir/beos/etc/ -$cp ${sPrefix}src/kernel/apps/fortune/fortunes $targetDir/beos/etc/ +$cp ${sPrefix}src/tests/kernel/boot_floppy/fortune/fortunes $targetDir/beos/etc/ $cp -r ${sPrefix}distro/${arch}.R1/beos/etc $targetDir/beos/ $cp ${sPrefix}data/settings/kernel/drivers/kernel \ $targetDir/home/config/settings/kernel/drivers/