Skip to content

Commit

Permalink
Merge pull request hrydgard#19249 from hrydgard/miniupnp-upgrade
Browse files Browse the repository at this point in the history 
Ugprade miniupnp submodule to latest
  • Loading branch information
@hrydgard
hrydgard authored Jun 4, 2024
2 parents 0388613 + ab257e3 commit a2ececd
Show file tree
Hide file tree
Showing 11 changed files with 193 additions and 208 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
url = https://github.com/hrydgard/ppsspp-freetype.git
[submodule "ext/miniupnp"]
path = ext/miniupnp
url = https://github.com/hrydgard/miniupnp.git
url = https://github.com/miniupnp/miniupnp.git
[submodule "zstd"]
path = ext/zstd
url = https://github.com/facebook/zstd.git
Expand Down
37 changes: 20 additions & 17 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2460,8 +2460,8 @@ if(USE_MINIUPNPC)
target_link_libraries(${CoreLibName} ${MINIUPNP_LIBRARY})
add_definitions(-DWITH_UPNP -DUSE_SYSTEM_MINIUPNPC)
else()
set (MINIUPNPC_VERSION 2.1) # used by miniupnpcstrings.h.cmake
set (MINIUPNPC_API_VERSION 17)
set (MINIUPNPC_VERSION 2.2) # used by miniupnpcstrings.h.cmake
set (MINIUPNPC_API_VERSION 18)
option(UPNPC_BUILD_STATIC "Build static library" TRUE)
option(NO_GETADDRINFO "Define NO_GETADDRINFO" FALSE)
mark_as_advanced(NO_GETADDRINFO)
Expand All @@ -2485,25 +2485,28 @@ if(USE_MINIUPNPC)
add_definitions(-DWITH_UPNP -DMINIUPNP_STATICLIB)
set(MINIUPNP_DIR "ext/miniupnp/miniupnpc")
include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(ext/miniupnp/miniupnpc/src)
include_directories(ext/miniupnp/miniupnpc/include)
configure_file(${MINIUPNP_DIR}/miniupnpcstrings.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/miniupnpcstrings.h) # by default miniupnp repo doesn't contains miniupnpcstrings.h and need to be generated
set(MINIUPNPC_SOURCES
# the needed bits of miniupnpc (no python module, no tests, no cli)
${MINIUPNP_DIR}/addr_is_reserved.c
${MINIUPNP_DIR}/connecthostport.c
${MINIUPNP_DIR}/igd_desc_parse.c
${MINIUPNP_DIR}/minisoap.c
${MINIUPNP_DIR}/minissdpc.c
${MINIUPNP_DIR}/miniupnpc.c
${MINIUPNP_DIR}/miniwget.c
${MINIUPNP_DIR}/minixml.c
${MINIUPNP_DIR}/minixmlvalid.c
${MINIUPNP_DIR}/portlistingparse.c
${MINIUPNP_DIR}/receivedata.c
${MINIUPNP_DIR}/src/addr_is_reserved.c
${MINIUPNP_DIR}/src/connecthostport.c
${MINIUPNP_DIR}/src/igd_desc_parse.c
${MINIUPNP_DIR}/src/minisoap.c
${MINIUPNP_DIR}/src/minissdpc.c
${MINIUPNP_DIR}/src/miniupnpc.c
#${MINIUPNP_DIR}/miniupnpcmodule.c
${MINIUPNP_DIR}/src/miniwget.c
${MINIUPNP_DIR}/src/minixml.c
${MINIUPNP_DIR}/src/minixmlvalid.c
${MINIUPNP_DIR}/src/portlistingparse.c
${MINIUPNP_DIR}/src/receivedata.c
#${MINIUPNP_DIR}/upnpc.c # causing an error due to already existing _main()
${MINIUPNP_DIR}/upnpcommands.c
${MINIUPNP_DIR}/upnpdev.c
${MINIUPNP_DIR}/upnperrors.c
${MINIUPNP_DIR}/upnpreplyparse.c
${MINIUPNP_DIR}/src/upnpcommands.c
${MINIUPNP_DIR}/src/upnpdev.c
${MINIUPNP_DIR}/src/upnperrors.c
${MINIUPNP_DIR}/src/upnpreplyparse.c
${CMAKE_CURRENT_BINARY_DIR}/miniupnpcstrings.h
)
if (NOT WIN32 AND NOT CMAKE_SYSTEM_NAME STREQUAL "AmigaOS")
Expand Down
2 changes: 1 addition & 1 deletion Core/Util/PortManager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ bool PortManager::Initialize(const unsigned int timeout) {

// Get LAN IP address that connects to the router
char lanaddr[64] = "unset";
int status = UPNP_GetValidIGD(devlist, urls, datas, lanaddr, sizeof(lanaddr)); //possible "status" values, 0 = NO IGD found, 1 = A valid connected IGD has been found, 2 = A valid IGD has been found but it reported as not connected, 3 = an UPnP device has been found but was not recognized as an IGD
int status = UPNP_GetValidIGD(devlist, urls, datas, lanaddr, sizeof(lanaddr), nullptr, 0); //possible "status" values, 0 = NO IGD found, 1 = A valid connected IGD has been found, 2 = A valid IGD has been found but it reported as not connected, 3 = an UPnP device has been found but was not recognized as an IGD
m_lanip = std::string(lanaddr);
INFO_LOG(SCENET, "PortManager - Detected LAN IP: %s", m_lanip.c_str());

Expand Down
12 changes: 6 additions & 6 deletions Core/Util/PortManager.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@
#pragma once

#ifdef USE_SYSTEM_MINIUPNPC
#include <miniupnpc/miniwget.h>
#include <miniupnpc/miniupnpc.h>
#include <miniupnpc/upnpcommands.h>
#include <miniupnpc/include/miniwget.h>
#include <miniupnpc/include/miniupnpc.h>
#include <miniupnpc/include/upnpcommands.h>
#else
#ifndef MINIUPNP_STATICLIB
#define MINIUPNP_STATICLIB
#endif
#include "ext/miniupnp/miniupnpc/miniwget.h"
#include "ext/miniupnp/miniupnpc/miniupnpc.h"
#include "ext/miniupnp/miniupnpc/upnpcommands.h"
#include "ext/miniupnp/miniupnpc/include/miniwget.h"
#include "ext/miniupnp/miniupnpc/include/miniupnpc.h"
#include "ext/miniupnp/miniupnpc/include/upnpcommands.h"
#endif

#include <string>
Expand Down
62 changes: 30 additions & 32 deletions UWP/miniupnpc_UWP/miniupnpc_UWP.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<SDLCheck>true</SDLCheck>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NOMINMAX;MINIUPNP_STATICLIB;_WINSOCK_DEPRECATED_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>../../ext/miniupnpc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../ext/miniupnp-build;../../ext/miniupnp/miniupnpc/include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand All @@ -89,7 +89,7 @@
<SDLCheck>true</SDLCheck>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NOMINMAX;MINIUPNP_STATICLIB;_WINSOCK_DEPRECATED_NO_WARNINGS;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>../../ext/miniupnpc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../ext/miniupnp-build;../../ext/miniupnp/miniupnpc/include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand All @@ -111,7 +111,7 @@
<SDLCheck>true</SDLCheck>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NOMINMAX;MINIUPNP_STATICLIB;_WINSOCK_DEPRECATED_NO_WARNINGS;_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>../../ext/miniupnpc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../ext/miniupnp-build;../../ext/miniupnp/miniupnpc/include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand All @@ -127,42 +127,40 @@
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\addr_is_reserved.h" />
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\connecthostport.h" />
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\igd_desc_parse.h" />
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\minisoap.h" />
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\minissdpc.h" />
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\miniupnpc.h" />
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\miniwget.h" />
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\minixml.h" />
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\portlistingparse.h" />
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\receivedata.h" />
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\upnpcommands.h" />
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\upnpdev.h" />
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\upnperrors.h" />
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\upnpreplyparse.h" />
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\addr_is_reserved.c" />
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\connecthostport.c" />
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\igd_desc_parse.c" />
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\minisoap.c" />
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\minissdpc.c" />
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\miniupnpc.c" />
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\miniwget.c" />
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\minixml.c" />
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\minixmlvalid.c" />
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\portlistingparse.c" />
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\receivedata.c" />
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\upnpcommands.c" />
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\upnpdev.c" />
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\upnperrors.c" />
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\upnpreplyparse.c" />
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\addr_is_reserved.c" />
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\connecthostport.c" />
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\igd_desc_parse.c" />
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\minisoap.c" />
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\minissdpc.c" />
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\miniupnpc.c" />
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\miniwget.c" />
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\minixml.c" />
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\minixmlvalid.c" />
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\portlistingparse.c" />
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\receivedata.c" />
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\upnpcommands.c" />
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\upnpdev.c" />
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\upnperrors.c" />
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\upnpreplyparse.c" />
<ClCompile Include="pch.c">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\..\ext\miniupnp\miniupnpc\msvc\genminiupnpcstrings.vbs" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\src\addr_is_reserved.h" />
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\src\codelength.h" />
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\src\connecthostport.h" />
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\src\minisoap.h" />
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\src\minissdpc.h" />
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\src\miniupnpc_socketdef.h" />
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\src\miniwget_private.h" />
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\src\minixml.h" />
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\src\receivedata.h" />
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\src\win32_snprintf.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
Expand Down
90 changes: 39 additions & 51 deletions UWP/miniupnpc_UWP/miniupnpc_UWP.vcxproj.filters
View file
Original file line number Diff line number Diff line change
@@ -1,108 +1,96 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\connecthostport.c">
<ClCompile Include="pch.c" />
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\addr_is_reserved.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\igd_desc_parse.c">
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\connecthostport.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\minisoap.c">
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\igd_desc_parse.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\minissdpc.c">
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\minisoap.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\miniupnpc.c">
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\minissdpc.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\miniwget.c">
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\miniupnpc.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\minixml.c">
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\miniwget.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\minixmlvalid.c">
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\minixml.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\portlistingparse.c">
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\minixmlvalid.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\receivedata.c">
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\portlistingparse.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\upnpcommands.c">
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\receivedata.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\upnpdev.c">
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\upnpcommands.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\upnperrors.c">
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\upnpdev.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\upnpreplyparse.c">
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\upnperrors.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="pch.c" />
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\addr_is_reserved.c">
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\upnpreplyparse.c">
<Filter>src</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\connecthostport.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\igd_desc_parse.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\minisoap.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\minissdpc.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\miniupnpc.h">
<Filter Include="src">
<UniqueIdentifier>{3e20a98f-6a6c-4ba1-8b5a-d44430460dd1}</UniqueIdentifier>
</Filter>
<Filter Include="scripts">
<UniqueIdentifier>{f940ecfb-a971-43b3-9f9d-afe3545e9798}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<None Include="..\..\ext\miniupnp\miniupnpc\msvc\genminiupnpcstrings.vbs">
<Filter>scripts</Filter>
</None>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\src\addr_is_reserved.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\miniwget.h">
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\src\codelength.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\minixml.h">
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\src\connecthostport.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\portlistingparse.h">
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\src\minisoap.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\receivedata.h">
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\src\minissdpc.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\upnpcommands.h">
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\src\miniupnpc_socketdef.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\upnpdev.h">
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\src\miniwget_private.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\upnperrors.h">
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\src\minixml.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\upnpreplyparse.h">
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\src\receivedata.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\addr_is_reserved.h">
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\src\win32_snprintf.h">
<Filter>src</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="src">
<UniqueIdentifier>{3e20a98f-6a6c-4ba1-8b5a-d44430460dd1}</UniqueIdentifier>
</Filter>
<Filter Include="scripts">
<UniqueIdentifier>{f940ecfb-a971-43b3-9f9d-afe3545e9798}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<None Include="..\..\ext\miniupnp\miniupnpc\msvc\genminiupnpcstrings.vbs">
<Filter>scripts</Filter>
</None>
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ext/miniupnp
Submodule miniupnp updated 169 files
32 changes: 16 additions & 16 deletions ext/miniupnp-build/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,26 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libminiupnp-build
LOCAL_ARM_MODE := arm
LOCAL_SRC_FILES := \
../miniupnp/miniupnpc/addr_is_reserved.c \
../miniupnp/miniupnpc/connecthostport.c \
../miniupnp/miniupnpc/igd_desc_parse.c \
../miniupnp/miniupnpc/minisoap.c \
../miniupnp/miniupnpc/minissdpc.c \
../miniupnp/miniupnpc/miniupnpc.c \
../miniupnp/miniupnpc/miniwget.c \
../miniupnp/miniupnpc/minixml.c \
../miniupnp/miniupnpc/minixmlvalid.c \
../miniupnp/miniupnpc/portlistingparse.c \
../miniupnp/miniupnpc/receivedata.c \
../miniupnp/miniupnpc/upnpcommands.c \
../miniupnp/miniupnpc/upnpdev.c \
../miniupnp/miniupnpc/upnperrors.c \
../miniupnp/miniupnpc/upnpreplyparse.c
../miniupnp/miniupnpc/src/addr_is_reserved.c \
../miniupnp/miniupnpc/src/connecthostport.c \
../miniupnp/miniupnpc/src/igd_desc_parse.c \
../miniupnp/miniupnpc/src/minisoap.c \
../miniupnp/miniupnpc/src/minissdpc.c \
../miniupnp/miniupnpc/src/miniupnpc.c \
../miniupnp/miniupnpc/src/miniwget.c \
../miniupnp/miniupnpc/src/minixml.c \
../miniupnp/miniupnpc/src/minixmlvalid.c \
../miniupnp/miniupnpc/src/portlistingparse.c \
../miniupnp/miniupnpc/src/receivedata.c \
../miniupnp/miniupnpc/src/upnpcommands.c \
../miniupnp/miniupnpc/src/upnpdev.c \
../miniupnp/miniupnpc/src/upnperrors.c \
../miniupnp/miniupnpc/src/upnpreplyparse.c

LOCAL_CFLAGS := -O3 -fsigned-char -fno-strict-aliasing -Wall -Wno-multichar -D__STDC_CONSTANT_MACROS
LOCAL_CPPFLAGS := -fno-exceptions -std=gnu++11 -fno-rtti -Wno-reorder
# Note: LOCAL_PATH is the directory this file is in.
LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. $(LOCAL_PATH)/../miniupnp ..
LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. $(LOCAL_PATH)/../miniupnp/miniupnpc/src $(LOCAL_PATH)/../miniupnp/miniupnpc/include ..

ifeq ($(findstring armeabi-v7a,$(TARGET_ARCH_ABI)),armeabi-v7a)
LOCAL_CFLAGS := $(LOCAL_CFLAGS)
Expand Down
Loading

0 comments on commit a2ececd

Please sign in to comment.