fix configure X check to not trigger if using mac gui and some

more warning fixes
This commit is contained in:
Alexei Svitkine 2017-12-02 13:27:14 -05:00
parent a472d9ab63
commit c18d6fa923
2 changed files with 4 additions and 4 deletions

View File

@ -313,8 +313,8 @@ else
SDL_SUPPORT="none"
fi
dnl We need X11, if not using SDL.
if [[ "x$WANT_SDL_VIDEO" = "xno" ]]; then
dnl We need X11, if not using SDL or Mac GUI.
if [[ "x$WANT_SDL_VIDEO" = "xno" -a "x$WANT_MACOSX_GUI" = "xno"]]; then
AC_PATH_XTRA
if [[ "x$no_x" = "xyes" ]]; then
AC_MSG_ERROR([You need X11 to run Basilisk II.])

View File

@ -1683,8 +1683,8 @@ bool PatchROM(void)
if (ROMBreakpoint) {
#if ENABLE_MON
mon_add_break_point(ROMBaseMac + ROMBreakpoint);
printf("ROM start address at %08lx\n", ROMBaseMac);
printf("Set ROM break point at %08lx\n", ROMBaseMac + ROMBreakpoint);
printf("ROM start address at %08x\n", ROMBaseMac);
printf("Set ROM break point at %08x\n", ROMBaseMac + ROMBreakpoint);
#else
uint16 *wp = (uint16 *)(ROMBaseHost + ROMBreakpoint);
*wp = htons(M68K_EMUL_BREAK);