| diff -ru bochs-2.6.11.orig/cpu/icache.h bochs-2.6.11/cpu/icache.h |
| |
| |
| @@ -28,7 +28,7 @@ |
| |
| class bxPageWriteStampTable |
| { |
| - const Bit32u PHY_MEM_PAGES = 1024*1024; |
| + #define PHY_MEM_PAGES (1024*1024) |
| Bit32u *fineGranularityMapping; |
| |
| public: |
| diff -ru bochs-2.6.9.orig/main.cc bochs-2.6.9/main.cc |
| |
| |
| @@ -1525,5 +1525,9 @@ |
| } |
| #endif |
| |
| + /* FIXME: this works, but definitely isn't right! */ |
| + if(signum == 0) |
| + return; |
| + |
| BX_PANIC(("SIGNAL %u caught", signum)); |
| } |
| diff -ru bochs-2.6.9.orig/configure bochs-2.6.9/configure |
| |
| |
| @@ -23665,7 +23665,7 @@ |
| |
| fi |
| case "$target" in |
| - *-pc-windows* | *-pc-winnt* | *-cygwin* | *-mingw32* | *-msys) |
| + *-pc-windows* | *-pc-winnt* | *-cygwin* | *-mingw32* | *-msys | *-midipix*) |
| NETLOW_OBJS="$NETLOW_OBJS eth_win32.o" |
| ethernet_modules="$ethernet_modules win32" |
| $as_echo "#define BX_NETMOD_WIN32 1" >>confdefs.h |
| @@ -24629,10 +24629,10 @@ |
| SPECIFIC_GUI_OBJS="$SPECIFIC_GUI_OBJS \$(GUI_OBJS_SDL)" |
| # GUI_*FLAGS are added to the compilation of every bochs file, not just |
| # the files in gui/*.cc. |
| - SDL_CFLAGS=`sdl-config --cflags` |
| + SDL_CFLAGS=`$PKG_CONFIG --cflags sdl` |
| GUI_CFLAGS="$GUI_CFLAGS $SDL_CFLAGS" |
| GUI_CXXFLAGS="$GUI_CXXFLAGS $SDL_CFLAGS" |
| - GUI_LINK_OPTS_SDL="`sdl-config --libs`" |
| + GUI_LINK_OPTS_SDL=`$PKG_CONFIG --libs sdl` |
| GUI_LINK_OPTS="$GUI_LINK_OPTS \$(GUI_LINK_OPTS_SDL)" |
| # The enhanced X debugger depends on GTK2 |
| if test "$gui_debugger" = 1 -a "$DEFAULT_GUI" != win32; then |
| diff -ru bochs-2.6.9.orig/gui/term.cc bochs-2.6.9/gui/term.cc |
| |
| |
| @@ -29,7 +29,7 @@ |
| #if BX_WITH_TERM |
| |
| extern "C" { |
| -#include <curses.h> |
| +#include <ncurses.h> |
| #include <signal.h> |
| }; |
| |