Swiftdiff options
Diffstat (limited to '3rdParty/LibMiniUPnPc')
| -rw-r--r-- | 3rdParty/LibMiniUPnPc/01_android_compilation_fixes.diff | 16 | ||||
| -rw-r--r-- | 3rdParty/LibMiniUPnPc/SConscript | 4 | ||||
| -rw-r--r-- | 3rdParty/LibMiniUPnPc/src/miniupnpc/minissdpc.c | 5 | ||||
| -rw-r--r-- | 3rdParty/LibMiniUPnPc/src/miniupnpc/miniwget.c | 4 |
4 files changed, 27 insertions, 2 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 c482109..505060f 100644 --- a/3rdParty/LibMiniUPnPc/SConscript +++ b/3rdParty/LibMiniUPnPc/SConscript @@ -8,8 +8,8 @@ if env.get("LIBMINIUPNPC_BUNDLED", False) : if env["SCONS_STAGE"] == "flags" : + env["HAVE_LIBMINIUPNPC"] = True env["LIBMINIUPNPC_FLAGS"] = { "CPPPATH": [Dir("src/miniupnpc")], "LIBPATH": [Dir(".")], - "LIBS": ["Swiften_MiniUPnPc"], "INTERNAL_CPPDEFINES": ["STATICLIB"], } @@ -51,5 +51,5 @@ if env.get("LIBMINIUPNPC_BUNDLED", False) : """.replace("$OS_STRING", myenv["PLATFORM"]))) - myenv.StaticLibrary("Swiften_MiniUPnPc", [ + env["LIBMINIUPNPC_OBJECTS"] = myenv.SwiftenObject([ "src/miniupnpc/igd_desc_parse.c", "src/miniupnpc/miniupnpc.c", diff --git a/3rdParty/LibMiniUPnPc/src/miniupnpc/minissdpc.c b/3rdParty/LibMiniUPnPc/src/miniupnpc/minissdpc.c index e61c1cd..a92c009 100644 --- a/3rdParty/LibMiniUPnPc/src/miniupnpc/minissdpc.c +++ b/3rdParty/LibMiniUPnPc/src/miniupnpc/minissdpc.c @@ -23,5 +23,10 @@ #include <io.h> #include <winsock.h> +#if _MSC_VER >= 1600 #include <stdint.h> +#else +typedef __int16 int16_t; +typedef unsigned __int16 uint16_t; +#endif #endif #if defined(__amigaos__) || defined(__amigaos4__) 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 @@ -45,4 +45,8 @@ #endif +#ifdef __ANDROID__ +#define MIN(x,y) (((x)<(y))?(x):(y)) +#endif + #include "miniupnpcstrings.h" #include "miniwget.h" |