Swiftdiff options
Diffstat (limited to '3rdParty/LibMiniUPnPc')
| -rw-r--r-- | 3rdParty/LibMiniUPnPc/01_android_compilation_fixes.diff | 16 | ||||
| -rw-r--r-- | 3rdParty/LibMiniUPnPc/SConscript | 1 |
2 files changed, 17 insertions, 0 deletions
diff --git a/3rdParty/LibMiniUPnPc/01_android_compilation_fixes.diff b/3rdParty/LibMiniUPnPc/01_android_compilation_fixes.diff new file mode 100644 index 0000000..4d7ade5 --- /dev/null +++ b/3rdParty/LibMiniUPnPc/01_android_compilation_fixes.diff @@ -0,0 +1,16 @@ +diff --git a/3rdParty/LibMiniUPnPc/src/miniupnpc/miniwget.c b/3rdParty/LibMiniUPnPc/src/miniupnpc/miniwget.c +index 87f6155..0c31416 100644 +--- a/3rdParty/LibMiniUPnPc/src/miniupnpc/miniwget.c ++++ b/3rdParty/LibMiniUPnPc/src/miniupnpc/miniwget.c +@@ -44,6 +44,10 @@ + #define MIN(x,y) (((x)<(y))?(x):(y)) + #endif + ++#ifdef __ANDROID__ ++#define MIN(x,y) (((x)<(y))?(x):(y)) ++#endif ++ + #include "miniupnpcstrings.h" + #include "miniwget.h" + #include "connecthostport.h" +--
\ No newline at end of file diff --git a/3rdParty/LibMiniUPnPc/SConscript b/3rdParty/LibMiniUPnPc/SConscript index 0cf0be7..505060f 100644 --- a/3rdParty/LibMiniUPnPc/SConscript +++ b/3rdParty/LibMiniUPnPc/SConscript @@ -7,6 +7,7 @@ if env.get("LIBMINIUPNPC_BUNDLED", False) : ################################################################################ if env["SCONS_STAGE"] == "flags" : + env["HAVE_LIBMINIUPNPC"] = True env["LIBMINIUPNPC_FLAGS"] = { "CPPPATH": [Dir("src/miniupnpc")], "LIBPATH": [Dir(".")], |