summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Buren <braewoods+rb@braewoods.net>2021-06-10 04:14:43 +0000
committerJames Buren <braewoods+rb@braewoods.net>2021-06-11 19:32:55 +0000
commitfe9bcd0468b81b9890606fda1840a43a6d809133 (patch)
treec743d295e1c20d7666f236897dce22ac7fc55ea9
parentab0f23c4b17dfb4f7aa37cdc0e504c2512112fc0 (diff)
downloadrockbox-fe9bcd0468.tar.gz
rockbox-fe9bcd0468.zip
beastpatcher: fix some minor issues
This mainly fixes some compiler warnings and makes it work with mingw64. Change-Id: Iabd13b5bed3427869ae78ceeb7e2255e68a6f7bd
-rw-r--r--utils/MTP/beastpatcher/Makefile4
-rw-r--r--utils/MTP/beastpatcher/mtp_libmtp.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/utils/MTP/beastpatcher/Makefile b/utils/MTP/beastpatcher/Makefile
index 8be8c39d49..74cc46bf44 100644
--- a/utils/MTP/beastpatcher/Makefile
+++ b/utils/MTP/beastpatcher/Makefile
@@ -10,12 +10,12 @@ OUTPUT=beastpatcher.exe
CROSS=
else
OUTPUT=beastpatcher
-CROSS=i586-mingw32msvc-
+CROSS=i686-w64-mingw32-
endif
endif
ifneq ($(findstring MINGW,$(shell uname)),MINGW)
-LIBS := -lmtp -lusb
+LIBS := -lmtp
ifdef STATIC
LIBS := -Wl,-Bstatic $(LIBS) -Wl,-Bdynamic
endif
diff --git a/utils/MTP/beastpatcher/mtp_libmtp.c b/utils/MTP/beastpatcher/mtp_libmtp.c
index 67b009b923..7377c520ea 100644
--- a/utils/MTP/beastpatcher/mtp_libmtp.c
+++ b/utils/MTP/beastpatcher/mtp_libmtp.c
@@ -123,6 +123,8 @@ int mtp_send_firmware(struct mtp_info_t* mtp_info, unsigned char* fwbuf,
size_t n;
FILE* fwfile;
+ (void) ret; /* suppress a set but not used warning */
+
/* Open a temporary file - this will be automatically deleted when closed */
fwfile = tmpfile();