Removed the non-working keyboard hook, and with it, the NOHOOK make parameter.

src/win/Makefile.mingw

@@ -297,22 +297,39 @@ TOOL_PREFIX     := x86_64-w64-mingw32-
 else
 TOOL_PREFIX     := i686-w64-mingw32-
 endif
-CPP             := ${TOOL_PREFIX}g++
-CC              := ${TOOL_PREFIX}gcc
 WINDRES		:= windres
 STRIP		:= strip
 ifeq ($(ARM64), y)
-CPP		:= aarch64-w64-mingw32-g++
-CC		:= aarch64-w64-mingw32-gcc
 WINDRES		:= aarch64-w64-mingw32-windres
 STRIP		:= aarch64-w64-mingw32-strip
 endif
 ifeq ($(ARM), y)
-CPP		:= armv7-w64-mingw32-g++
-CC		:= armv7-w64-mingw32-gcc
 WINDRES		:= armv7-w64-mingw32-windres
 STRIP		:= armv7-w64-mingw32-strip
 endif
+ifeq ($(CLANG), y)
+CPP             := clang++
+CC              := clang
+ifeq ($(ARM64), y)
+CPP		:= aarch64-w64-mingw32-clang++
+CC		:= aarch64-w64-mingw32-clang
+endif
+ifeq ($(ARM), y)
+CPP		:= armv7-w64-mingw32-clang++
+CC		:= armv7-w64-mingw32-clang
+endif
+else
+CPP             := ${TOOL_PREFIX}g++
+CC              := ${TOOL_PREFIX}gcc
+ifeq ($(ARM64), y)
+CPP		:= aarch64-w64-mingw32-g++
+CC		:= aarch64-w64-mingw32-gcc
+endif
+ifeq ($(ARM), y)
+CPP		:= armv7-w64-mingw32-g++
+CC		:= armv7-w64-mingw32-gcc
+endif
+endif
 DEPS		= -MMD -MF $*.d -c $<
 DEPFILE		:= win/.depends
 
@@ -326,15 +343,11 @@ endif
 ifdef EXINC
 OPTS		+= -I$(EXINC)
 endif
-ifeq ($(X64), y)
- ifeq ($(OPTIM), y)
-  DFLAGS	:= -march=native
- else
-  DFLAGS	:=
- endif
+ifeq ($(OPTIM), y)
+ DFLAGS	:= -march=native
 else
- ifeq ($(OPTIM), y)
-  DFLAGS	:= -march=native
+ ifeq ($(X64), y)
+  DFLAGS	:=
  else
   DFLAGS	:= -march=i686
  endif
@@ -378,10 +391,6 @@ ifeq ($(VRAMDUMP), y)
 OPTS		+= -DENABLE_VRAM_DUMP
 RFLAGS		+= -DENABLE_VRAM_DUMP
 endif
-ifeq ($(NOHOOK), y)
-OPTS		+= -DNO_KEYBOARD_HOOK
-RFLAGS		+= -DNO_KEYBOARD_HOOK
-endif
 
 
 # Optional modules.
@@ -829,7 +838,7 @@ LIBS    += -static
 ifeq ($(AUTODEP), y)
 %.o:		%.c
 		@echo $<
-		@$(CC) $(CFLAGS) $(DEPS) -c $<
+		$(CC) $(CFLAGS) $(DEPS) -c $<
 
 %.o:		%.cc
 		@echo $<
@@ -866,7 +875,9 @@ endif
 
 # Suppress false positive warnings in vid_voodoo_codegen_x86[-64].h
 # that cause ~3000 lines to be output into the logs each time.
-$(VOODOOOBJ): CFLAGS += -Wstringop-overflow=0
+ifneq ($(CLANG), y)
+ $(VOODOOOBJ): CFLAGS += -Wstringop-overflow=0
+endif
 
 all:		$(PROG).exe