diff options
| author | Tony Theodore <tonyt@logyst.com> | 2015-12-14 07:30:13 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2015-12-14 07:30:13 (GMT) |
| commit | e395e899f58ce579257eac84ee43ceb4430ec494 (patch) | |
| tree | 3ee1187e8d4b534926ed85bddf1438a8cb9375d4 /src | |
| parent | ca0cca029d54f74e406d183b70f702f092065296 (diff) | |
| parent | b07afe2f7083001c8268681a8f5f63974f164f4c (diff) | |
| download | mxe-e395e899f58ce579257eac84ee43ceb4430ec494.zip mxe-e395e899f58ce579257eac84ee43ceb4430ec494.tar.gz mxe-e395e899f58ce579257eac84ee43ceb4430ec494.tar.bz2 | |
Merge pull request #1053 from LuaAndC/fix-miniupnpc
Fix miniupnpc
Diffstat (limited to 'src')
| -rw-r--r-- | src/miniupnpc-1-fixes.patch | 30 | ||||
| -rw-r--r-- | src/miniupnpc-build-1.patch | 28 |
2 files changed, 30 insertions, 28 deletions
diff --git a/src/miniupnpc-1-fixes.patch b/src/miniupnpc-1-fixes.patch new file mode 100644 index 0000000..8fd7849 --- /dev/null +++ b/src/miniupnpc-1-fixes.patch @@ -0,0 +1,30 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev <bnagaev@gmail.com> +Date: Sun, 13 Dec 2015 16:56:42 +0300 +Subject: [PATCH] cmake: add headers to install + + * bsdqueue.h + * miniupnpctypes.h + * portlistingparse.h + +See https://github.com/mxe/mxe/issues/1051#issuecomment-164260560 + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1111111..2222222 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -166,6 +166,9 @@ install (FILES + upnpreplyparse.h + upnperrors.h + declspec.h ++ bsdqueue.h ++ miniupnpctypes.h ++ portlistingparse.h + DESTINATION include/miniupnpc + ) + diff --git a/src/miniupnpc-build-1.patch b/src/miniupnpc-build-1.patch deleted file mode 100644 index 08eff8c..0000000 --- a/src/miniupnpc-build-1.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- ./Makefile.mingw 2014-01-31 14:18:56.000000000 +0100 -+++ ./Makefile.mingw.new 2015-04-27 15:44:59.548000000 +0200 -@@ -37,7 +37,7 @@ - $(PYTHON) setupmingw32.py install --skip-build - - miniupnpc.dll: libminiupnpc.a $(OBJSDLL) -- dllwrap -k --driver-name gcc \ -+ $(DLLWRAP) -k --driver-name $(CC) \ - --def miniupnpc.def \ - --output-def miniupnpc.dll.def \ - --implib miniupnpc.lib -o $@ \ -@@ -71,13 +71,13 @@ - miniupnpcstrings.h: miniupnpcstrings.h.in wingenminiupnpcstrings - wingenminiupnpcstrings $< $@ - --minixml.o: minixml.c minixml.h miniupnpcstrings.h -+minixml.o: minixml.c minixml.h - - upnpc.o: upnpc.c miniwget.h minisoap.h miniupnpc.h igd_desc_parse.h upnpreplyparse.h upnpcommands.h upnperrors.h - --miniwget.o: miniwget.c miniwget.h miniupnpcstrings.h connecthostport.h -+miniwget.o: miniwget.c miniwget.h connecthostport.h - --minisoap.o: minisoap.c minisoap.h miniupnpcstrings.h -+minisoap.o: minisoap.c minisoap.h - - miniupnpc.o: miniupnpc.c miniupnpc.h minisoap.h miniwget.h minixml.h - |