Minor cleanups after rebase onto master

Fix merge edit mistake in CMakeLists.txt
Add missing includes in draw.c, keyevent.c

CMakeLists.txt

@@ -93,6 +93,7 @@ ELSEIF(MAIKO_NETWORK_TYPE STREQUAL "SUN_NIT")
   MESSAGE("-- Configured for (SunOS) NIT networking")
 ELSEIF(NOT MAIKO_NETWORK_TYPE STREQUAL "NONE")
   MESSAGE(WARNING "Invalid option given for MAIKO_NETWORK_TYPE, must be one of:\nNONE, SUN_DLPI, SUN_NIT, NETHUB")
+ENDIF()
 
 OPTION(MAIKO_DISPLAY_SDL "Use SDL for display." ON)
 IF(MAIKO_DISPLAY_SDL)
@@ -452,8 +453,6 @@ IF(MAIKO_DISPLAY_X11)
   TARGET_LINK_LIBRARIES(ldex ${MAIKO_LIBRARIES} ${MAIKO_DISPLAY_X11_LIBRARIES})
 ENDIF()
 
-<<<<<<< HEAD
-=======
 IF(MAIKO_DISPLAY_SDL)
   ADD_EXECUTABLE(ldesdl
     src/main.c
@@ -473,7 +472,6 @@ ADD_EXECUTABLE(mkvdate src/mkvdate.c)
 TARGET_COMPILE_DEFINITIONS(mkvdate PUBLIC ${MAIKO_DEFINITIONS})
 TARGET_INCLUDE_DIRECTORIES(mkvdate PUBLIC inc)
 
->>>>>>> f58abe3 (Add prototypical SDL support.)
 ADD_EXECUTABLE(setsout src/setsout.c src/byteswap.c)
 TARGET_COMPILE_DEFINITIONS(setsout PUBLIC ${MAIKO_DEFINITIONS})
 TARGET_INCLUDE_DIRECTORIES(setsout PUBLIC inc)

src/draw.c

@@ -20,6 +20,7 @@
 #include <stddef.h>       // for ptrdiff_t
 #include <stdlib.h>       // for abs
 #include "adr68k.h"       // for NativeAligned2FromLAddr
+#include "bitblt.h"       // for MOUSEXR, MOUSEYH
 #include "display.h"      // for DISPLAYBUFFER, DisplayRegion68k, in_display...
 #include "drawdefs.h"     // for N_OP_drawline
 #include "emlglob.h"

src/keyevent.c

@@ -45,6 +45,7 @@ void Mouse_hndlr(void); /* Fields mouse events from driver        */
 #include "adr68k.h"
 #include "address.h"
 #include "stack.h"
+#include "initdspdefs.h"
 #include "keyboard.h"
 #include "display.h"
 #include "lsptypes.h"