Patch HID bootloader host app to fix Windows compilation (thanks to Duncan McDonald).

diff --git a/Bootloaders/HID/HostLoaderApp/Makefile b/Bootloaders/HID/HostLoaderApp/Makefile
index 7b2833e..d7d6458 100644 (file)
--- a/Bootloaders/HID/HostLoaderApp/Makefile
+++ b/Bootloaders/HID/HostLoaderApp/Makefile
@@ -13,8 +13,9 @@ hid_bootloader_cli: hid_bootloader_cli.c
 else ifeq ($(OS), WINDOWS)
 CC = i586-mingw32msvc-gcc
 CFLAGS ?= -O2 -Wall
 else ifeq ($(OS), WINDOWS)
 CC = i586-mingw32msvc-gcc
 CFLAGS ?= -O2 -Wall

+LDLIB = -lsetupapi -lhid

 hid_bootloader_cli.exe: hid_bootloader_cli.c
 hid_bootloader_cli.exe: hid_bootloader_cli.c

-       $(CC) $(CFLAGS) -s -DUSE_WIN32 -o hid_bootloader_cli.exe hid_bootloader_cli.c -lhid -lsetupapi
+       $(CC) $(CFLAGS) -s -DUSE_WIN32 -o hid_bootloader_cli.exe hid_bootloader_cli.c $(LDLIB)

 
 
 else ifeq ($(OS), MACOSX)
 
 
 else ifeq ($(OS), MACOSX)

diff --git a/Bootloaders/HID/HostLoaderApp/hid_bootloader_cli.c b/Bootloaders/HID/HostLoaderApp/hid_bootloader_cli.c
index 058ccc6..cdee1c3 100644 (file)
--- a/Bootloaders/HID/HostLoaderApp/hid_bootloader_cli.c
+++ b/Bootloaders/HID/HostLoaderApp/hid_bootloader_cli.c
@@ -934,8 +934,8 @@ int printf_verbose(const char *format, ...)
 
 void delay(double seconds)
 {
 
 void delay(double seconds)
 {

-       #ifdef WIN32
-       Sleep(seconds * 1000.0);
+       #ifdef USE_WIN32
+       sleep(seconds * 1000.0);

        #else
        usleep(seconds * 1000000.0);
        #endif
        #else
        usleep(seconds * 1000000.0);
        #endif


@@ -951,7 +951,7 @@ void die(const char *str, ...)
        exit(1);
 }
 
        exit(1);
 }
 

-#if defined(WIN32)
+#if defined USE_WIN32

 #define strcasecmp stricmp
 #endif
 
 #define strcasecmp stricmp
 #endif