From c18d6fa9232ba44c00f93627ee71add9d2f5a57f Mon Sep 17 00:00:00 2001 From: Alexei Svitkine Date: Sat, 2 Dec 2017 13:27:14 -0500 Subject: [PATCH] fix configure X check to not trigger if using mac gui and some more warning fixes --- BasiliskII/src/Unix/configure.ac | 4 ++-- BasiliskII/src/rom_patches.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BasiliskII/src/Unix/configure.ac b/BasiliskII/src/Unix/configure.ac index 09d7ae3b..0a05d16f 100644 --- a/BasiliskII/src/Unix/configure.ac +++ b/BasiliskII/src/Unix/configure.ac @@ -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.]) diff --git a/BasiliskII/src/rom_patches.cpp b/BasiliskII/src/rom_patches.cpp index 25cf5f38..fdedf5e2 100644 --- a/BasiliskII/src/rom_patches.cpp +++ b/BasiliskII/src/rom_patches.cpp @@ -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);