Commit 5972f560 authored by Steve Lhomme's avatar Steve Lhomme Committed by Jean-Baptiste Kempf

contrib: fix live555 usage on Windows App Store builds

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent bd72d72c
...@@ -53,6 +53,7 @@ live555: $(LIVE555_FILE) .sum-live555 ...@@ -53,6 +53,7 @@ live555: $(LIVE555_FILE) .sum-live555
ifdef HAVE_ANDROID ifdef HAVE_ANDROID
cd live && sed -e 's%-DPIC%-DPIC -DNO_SSTREAM=1 -DLOCALE_NOT_USED -I$(ANDROID_NDK)/platforms/$(ANDROID_API)/arch-$(PLATFORM_SHORT_ARCH)/usr/include%' -i.orig config.linux cd live && sed -e 's%-DPIC%-DPIC -DNO_SSTREAM=1 -DLOCALE_NOT_USED -I$(ANDROID_NDK)/platforms/$(ANDROID_API)/arch-$(PLATFORM_SHORT_ARCH)/usr/include%' -i.orig config.linux
endif endif
cd live && patch -lfp1 < ../../src/live555/winstore.patch
mv live $@ mv live $@
touch $@ touch $@
......
--- a/liveMedia/include/InputFile.hh 2015-06-24 16:32:45.000000000 +0200
+++ b/liveMedia/include/InputFile.hh 2015-08-04 10:12:13.791494000 +0200
@@ -50,6 +50,7 @@
void CloseInputFile(FILE* fid);
+#undef GetFileSize
u_int64_t GetFileSize(char const* fileName, FILE* fid);
// 0 means zero-length, unbounded, or unknown
--- a/BasicUsageEnvironment/BasicUsageEnvironment0.cpp 2015-06-24 16:32:45.000000000 +0200
+++ b/BasicUsageEnvironment/BasicUsageEnvironment0.cpp 2015-08-04 10:22:41.067003200 +0200
@@ -68,6 +68,7 @@
if (err == 0) err = getErrno();
#if defined(__WIN32__) || defined(_WIN32) || defined(_WIN32_WCE)
+#ifndef _UNICODE
char errMsg[RESULT_MSG_BUFFER_MAX] = "\0";
if (0 != FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, err, 0, errMsg, sizeof(errMsg)/sizeof(errMsg[0]), NULL)) {
// Remove all trailing '\r', '\n' and '.'
@@ -77,6 +78,7 @@
} else
snprintf(errMsg, sizeof(errMsg)/sizeof(errMsg[0]), "error %d", err);
appendToResultMsg(errMsg);
+#endif
#else
appendToResultMsg(strerror(err));
#endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment