Fixed build on MinGW with GCC

zecho · Aug 30, 2017 · 886f3a8 · 886f3a8
1 parent 1fec9eb
commit 886f3a8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/config.lib b/config.lib
@@ -984,6 +984,7 @@ make_cflags_and_ldflags() {
 	# And others like Windows
 	if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then
 		CFLAGS="$CFLAGS -DWIN"
+		LIBS="$LIBS -lShlwapi"
 	fi
 
 	if [ "$os" = "TOS" ]; then

diff --git a/src/os/file.h b/src/os/file.h
@@ -8,6 +8,10 @@
 	#define unlink _unlink
 	#include <ShlObj.h>
 	#include <Shlwapi.h>
+#elif defined(_WIN32)
+	#include <io.h>
+	#include <ShlObj.h>
+	#include <Shlwapi.h>
 #else /* _MSC_VER */
 	#include <unistd.h>
 #endif /* _MSC_VER */

diff --git a/src/video/video_win32.c b/src/video/video_win32.c
@@ -399,7 +399,7 @@ static LRESULT CALLBACK WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l
 			}
 
 			scan = MapKey(wParam);
-			// Real scancode is also ((lParam >> 16) & 0xff)
+			/* Real scancode is also ((lParam >> 16) & 0xff) */
 
 			if (scan == 0) {
 				Warning("Unhandled key %X (='%c')  (scan = %x)\n", wParam, wParam >= 32 ? wParam : '.', (lParam >> 16) & 0xff);