Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-22 21:09:52 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Ugprade miniupnp submodule to latest

Browse Source 
Maybe will help #19246, but no idea really.

Windows buildfix

UWP buildfix

miniupnpc path fixes

libretro buildfix attempt, android.mk
This commit is contained in:
Henrik Rydgård 2024-06-04 21:35:14 +02:00
parent 0388613ce2
commit ab257e335f
11 changed files with 216 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -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

37
CMakeLists.txt
View File

@ -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)
@ -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")

2
Core/Util/PortManager.cpp
View File

@ -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());

12
Core/Util/PortManager.h
View File

@ -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>

62
UWP/miniupnpc_UWP/miniupnpc_UWP.vcxproj
View File

@ -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>
@ -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>
@ -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>
@ -127,35 +127,21 @@
</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>
@ -163,6 +149,18 @@
<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>

134
UWP/miniupnpc_UWP/miniupnpc_UWP.vcxproj.filters
View File

@ -1,96 +1,52 @@
<?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">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\igd_desc_parse.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\minisoap.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\minissdpc.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\miniupnpc.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\miniwget.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\minixml.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\minixmlvalid.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\portlistingparse.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\receivedata.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\upnpcommands.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\upnpdev.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\upnperrors.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\upnpreplyparse.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="pch.c" />
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\addr_is_reserved.c">
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\addr_is_reserved.c">
<Filter>src</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\connecthostport.h">
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\connecthostport.c">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\igd_desc_parse.h">
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\igd_desc_parse.c">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\minisoap.h">
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\minisoap.c">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\minissdpc.h">
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\minissdpc.c">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\miniupnpc.h">
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\miniupnpc.c">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\miniwget.h">
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\miniwget.c">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\minixml.h">
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\minixml.c">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\portlistingparse.h">
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\minixmlvalid.c">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\receivedata.h">
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\portlistingparse.c">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\upnpcommands.h">
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\receivedata.c">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\upnpdev.h">
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\upnpcommands.c">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\upnperrors.h">
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\upnpdev.c">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\upnpreplyparse.h">
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\upnperrors.c">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\addr_is_reserved.h">
</ClCompile>
<ClCompile Include="..\..\ext\miniupnp\miniupnpc\src\upnpreplyparse.c">
<Filter>src</Filter>
</ClInclude>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="src">
@ -105,4 +61,36 @@
<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\src\codelength.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\src\connecthostport.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\src\minisoap.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\src\minissdpc.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\src\miniupnpc_socketdef.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\src\miniwget_private.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\src\minixml.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\src\receivedata.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\miniupnp\miniupnpc\src\win32_snprintf.h">
<Filter>src</Filter>
</ClInclude>
</ItemGroup>
</Project>

2
ext/miniupnp

@ -1 +1 @@
Subproject commit 3a87be33e797ba947b2b2a5f8d087f6c3ff4d93e
Subproject commit 27d13ca9beeb5541f5fbf11959dced03dac39972

32
ext/miniupnp-build/Android.mk
View File

@ -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)

70
ext/miniupnpc.vcxproj
View File

@ -35,44 +35,38 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClInclude Include="miniupnp\miniupnpc\addr_is_reserved.h" />
<ClInclude Include="miniupnp\miniupnpc\connecthostport.h" />
<ClInclude Include="miniupnp\miniupnpc\igd_desc_parse.h" />
<ClInclude Include="miniupnp\miniupnpc\minisoap.h" />
<ClInclude Include="miniupnp\miniupnpc\minissdpc.h" />
<ClInclude Include="miniupnp\miniupnpc\miniupnpc.h" />
<ClInclude Include="miniupnp\miniupnpc\miniwget.h" />
<ClInclude Include="miniupnp\miniupnpc\minixml.h" />
<ClInclude Include="miniupnp\miniupnpc\portlistingparse.h" />
<ClInclude Include="miniupnp\miniupnpc\receivedata.h" />
<ClInclude Include="miniupnp\miniupnpc\upnpcommands.h" />
<ClInclude Include="miniupnp\miniupnpc\upnpdev.h" />
<ClInclude Include="miniupnp\miniupnpc\upnperrors.h" />
<ClInclude Include="miniupnp\miniupnpc\upnpreplyparse.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="miniupnp\miniupnpc\addr_is_reserved.c" />
<ClCompile Include="miniupnp\miniupnpc\connecthostport.c" />
<ClCompile Include="miniupnp\miniupnpc\igd_desc_parse.c" />
<ClCompile Include="miniupnp\miniupnpc\minisoap.c" />
<ClCompile Include="miniupnp\miniupnpc\minissdpc.c" />
<ClCompile Include="miniupnp\miniupnpc\miniupnpc.c" />
<ClCompile Include="miniupnp\miniupnpc\miniwget.c" />
<ClCompile Include="miniupnp\miniupnpc\minixml.c" />
<ClCompile Include="miniupnp\miniupnpc\minixmlvalid.c" />
<ClCompile Include="miniupnp\miniupnpc\portlistingparse.c" />
<ClCompile Include="miniupnp\miniupnpc\receivedata.c" />
<ClCompile Include="miniupnp\miniupnpc\upnpcommands.c" />
<ClCompile Include="miniupnp\miniupnpc\upnpdev.c" />
<ClCompile Include="miniupnp\miniupnpc\upnperrors.c" />
<ClCompile Include="miniupnp\miniupnpc\upnpreplyparse.c" />
</ItemGroup>
<ItemGroup>
<None Include="miniupnp-build\Android.mk" />
<None Include="miniupnp\miniupnpc\msvc\genminiupnpcstrings.vbs">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</None>
</ItemGroup>
<ItemGroup>
<ClCompile Include="miniupnp\miniupnpc\src\addr_is_reserved.c" />
<ClCompile Include="miniupnp\miniupnpc\src\connecthostport.c" />
<ClCompile Include="miniupnp\miniupnpc\src\igd_desc_parse.c" />
<ClCompile Include="miniupnp\miniupnpc\src\minisoap.c" />
<ClCompile Include="miniupnp\miniupnpc\src\minissdpc.c" />
<ClCompile Include="miniupnp\miniupnpc\src\miniupnpc.c" />
<ClCompile Include="miniupnp\miniupnpc\src\miniwget.c" />
<ClCompile Include="miniupnp\miniupnpc\src\minixml.c" />
<ClCompile Include="miniupnp\miniupnpc\src\portlistingparse.c" />
<ClCompile Include="miniupnp\miniupnpc\src\receivedata.c" />
<ClCompile Include="miniupnp\miniupnpc\src\upnpcommands.c" />
<ClCompile Include="miniupnp\miniupnpc\src\upnpdev.c" />
<ClCompile Include="miniupnp\miniupnpc\src\upnperrors.c" />
<ClCompile Include="miniupnp\miniupnpc\src\upnpreplyparse.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="miniupnp\miniupnpc\src\addr_is_reserved.h" />
<ClInclude Include="miniupnp\miniupnpc\src\codelength.h" />
<ClInclude Include="miniupnp\miniupnpc\src\connecthostport.h" />
<ClInclude Include="miniupnp\miniupnpc\src\minisoap.h" />
<ClInclude Include="miniupnp\miniupnpc\src\minissdpc.h" />
<ClInclude Include="miniupnp\miniupnpc\src\miniupnpc_socketdef.h" />
<ClInclude Include="miniupnp\miniupnpc\src\miniwget_private.h" />
<ClInclude Include="miniupnp\miniupnpc\src\minixml.h" />
<ClInclude Include="miniupnp\miniupnpc\src\receivedata.h" />
<ClInclude Include="miniupnp\miniupnpc\src\win32_snprintf.h" />
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>16.0</VCProjectVersion>
<ProjectGuid>{D8A71225-178B-424E-96C1-CC3BE2C1B047}</ProjectGuid>
@ -228,6 +222,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<AdditionalIncludeDirectories>miniupnp/miniupnpc/include;miniupnp-build</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@ -257,6 +252,7 @@ cd..\..\..</Command>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<AdditionalIncludeDirectories>miniupnp/miniupnpc/include;miniupnp-build</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@ -288,6 +284,7 @@ cd..\..\..</Command>
<BufferSecurityCheck>false</BufferSecurityCheck>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<AdditionalIncludeDirectories>miniupnp/miniupnpc/include;miniupnp-build</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@ -322,6 +319,7 @@ cd..\..\..</Command>
<BufferSecurityCheck>false</BufferSecurityCheck>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<OmitFramePointers>false</OmitFramePointers>
<AdditionalIncludeDirectories>miniupnp/miniupnpc/include;miniupnp-build</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@ -351,6 +349,7 @@ cd..\..\..</Command>
<PreprocessorDefinitions>DEBUG;_DEBUG;WIN32;_LIB;MINIUPNP_STATICLIB;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<AdditionalIncludeDirectories>miniupnp/miniupnpc/include;miniupnp-build</AdditionalIncludeDirectories>
</ClCompile>
<Lib>
<AdditionalDependencies>iphlpapi.lib</AdditionalDependencies>
@ -369,6 +368,7 @@ cd..\..\..</Command>
<PreprocessorDefinitions>DEBUG;_DEBUG;WIN32;_LIB;MINIUPNP_STATICLIB;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<AdditionalIncludeDirectories>miniupnp/miniupnpc/include;miniupnp-build</AdditionalIncludeDirectories>
</ClCompile>
<Lib>
<AdditionalDependencies>iphlpapi.lib</AdditionalDependencies>
@ -392,6 +392,7 @@ cd..\..\..</Command>
<FunctionLevelLinking>true</FunctionLevelLinking>
<BufferSecurityCheck>false</BufferSecurityCheck>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<AdditionalIncludeDirectories>miniupnp/miniupnpc/include;miniupnp-build</AdditionalIncludeDirectories>
</ClCompile>
<Lib>
<AdditionalDependencies>iphlpapi.lib</AdditionalDependencies>
@ -415,6 +416,7 @@ cd..\..\..</Command>
<BufferSecurityCheck>false</BufferSecurityCheck>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>miniupnp/miniupnpc/include;miniupnp-build</AdditionalIncludeDirectories>
</ClCompile>
<Lib>
<AdditionalDependencies>iphlpapi.lib</AdditionalDependencies>

62
ext/miniupnpc.vcxproj.filters
View File

@ -1,38 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClInclude Include="miniupnp\miniupnpc\upnpcommands.h" />
<ClInclude Include="miniupnp\miniupnpc\upnperrors.h" />
<ClInclude Include="miniupnp\miniupnpc\upnpreplyparse.h" />
<ClInclude Include="miniupnp\miniupnpc\igd_desc_parse.h" />
<ClInclude Include="miniupnp\miniupnpc\minisoap.h" />
<ClInclude Include="miniupnp\miniupnpc\miniupnpc.h" />
<ClInclude Include="miniupnp\miniupnpc\miniwget.h" />
<ClInclude Include="miniupnp\miniupnpc\minixml.h" />
<ClInclude Include="miniupnp\miniupnpc\connecthostport.h" />
<ClInclude Include="miniupnp\miniupnpc\portlistingparse.h" />
<ClInclude Include="miniupnp\miniupnpc\receivedata.h" />
<ClInclude Include="miniupnp\miniupnpc\upnpdev.h" />
<ClInclude Include="miniupnp\miniupnpc\minissdpc.h" />
<ClInclude Include="miniupnp\miniupnpc\addr_is_reserved.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="miniupnp\miniupnpc\igd_desc_parse.c" />
<ClCompile Include="miniupnp\miniupnpc\minisoap.c" />
<ClCompile Include="miniupnp\miniupnpc\miniupnpc.c" />
<ClCompile Include="miniupnp\miniupnpc\miniwget.c" />
<ClCompile Include="miniupnp\miniupnpc\minixml.c" />
<ClCompile Include="miniupnp\miniupnpc\minixmlvalid.c" />
<ClCompile Include="miniupnp\miniupnpc\upnpcommands.c" />
<ClCompile Include="miniupnp\miniupnpc\upnperrors.c" />
<ClCompile Include="miniupnp\miniupnpc\upnpreplyparse.c" />
<ClCompile Include="miniupnp\miniupnpc\connecthostport.c" />
<ClCompile Include="miniupnp\miniupnpc\portlistingparse.c" />
<ClCompile Include="miniupnp\miniupnpc\receivedata.c" />
<ClCompile Include="miniupnp\miniupnpc\upnpdev.c" />
<ClCompile Include="miniupnp\miniupnpc\minissdpc.c" />
<ClCompile Include="miniupnp\miniupnpc\addr_is_reserved.c" />
</ItemGroup>
<ItemGroup>
<Filter Include="scripts">
<UniqueIdentifier>{c82edf03-bf88-478d-aaf5-2854df756cab}</UniqueIdentifier>
@ -42,6 +9,33 @@
<None Include="miniupnp\miniupnpc\msvc\genminiupnpcstrings.vbs">
<Filter>scripts</Filter>
</None>
<None Include="miniupnp-build\Android.mk" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="miniupnp\miniupnpc\src\addr_is_reserved.c" />
<ClCompile Include="miniupnp\miniupnpc\src\connecthostport.c" />
<ClCompile Include="miniupnp\miniupnpc\src\igd_desc_parse.c" />
<ClCompile Include="miniupnp\miniupnpc\src\minisoap.c" />
<ClCompile Include="miniupnp\miniupnpc\src\minissdpc.c" />
<ClCompile Include="miniupnp\miniupnpc\src\miniupnpc.c" />
<ClCompile Include="miniupnp\miniupnpc\src\miniwget.c" />
<ClCompile Include="miniupnp\miniupnpc\src\minixml.c" />
<ClCompile Include="miniupnp\miniupnpc\src\portlistingparse.c" />
<ClCompile Include="miniupnp\miniupnpc\src\receivedata.c" />
<ClCompile Include="miniupnp\miniupnpc\src\upnpcommands.c" />
<ClCompile Include="miniupnp\miniupnpc\src\upnpdev.c" />
<ClCompile Include="miniupnp\miniupnpc\src\upnperrors.c" />
<ClCompile Include="miniupnp\miniupnpc\src\upnpreplyparse.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="miniupnp\miniupnpc\src\addr_is_reserved.h" />
<ClInclude Include="miniupnp\miniupnpc\src\codelength.h" />
<ClInclude Include="miniupnp\miniupnpc\src\connecthostport.h" />
<ClInclude Include="miniupnp\miniupnpc\src\minisoap.h" />
<ClInclude Include="miniupnp\miniupnpc\src\minissdpc.h" />
<ClInclude Include="miniupnp\miniupnpc\src\miniupnpc_socketdef.h" />
<ClInclude Include="miniupnp\miniupnpc\src\miniwget_private.h" />
<ClInclude Include="miniupnp\miniupnpc\src\minixml.h" />
<ClInclude Include="miniupnp\miniupnpc\src\receivedata.h" />
<ClInclude Include="miniupnp\miniupnpc\src\win32_snprintf.h" />
</ItemGroup>
</Project>

32
libretro/Makefile.common
View File

@ -893,23 +893,23 @@ SOURCES_C += $(EXTDIR)/udis86/decode.c \
$(EXTDIR)/udis86/syn.c \
$(EXTDIR)/udis86/udis86.c
INCFLAGS += -I$(EXTDIR)/miniupnp-build
INCFLAGS += -I$(EXTDIR)/miniupnp-build -I$(EXTDIR)/miniupnp/miniupnpc/include -I$(EXTDIR)/miniupnp/miniupnpc/src
SOURCES_C += \
$(EXTDIR)/miniupnp/miniupnpc/addr_is_reserved.c \
$(EXTDIR)/miniupnp/miniupnpc/connecthostport.c \
$(EXTDIR)/miniupnp/miniupnpc/igd_desc_parse.c \
$(EXTDIR)/miniupnp/miniupnpc/minisoap.c \
$(EXTDIR)/miniupnp/miniupnpc/minissdpc.c \
$(EXTDIR)/miniupnp/miniupnpc/miniupnpc.c \
$(EXTDIR)/miniupnp/miniupnpc/miniwget.c \
$(EXTDIR)/miniupnp/miniupnpc/minixml.c \
$(EXTDIR)/miniupnp/miniupnpc/minixmlvalid.c \
$(EXTDIR)/miniupnp/miniupnpc/portlistingparse.c \
$(EXTDIR)/miniupnp/miniupnpc/receivedata.c \
$(EXTDIR)/miniupnp/miniupnpc/upnpcommands.c \
$(EXTDIR)/miniupnp/miniupnpc/upnpdev.c \
$(EXTDIR)/miniupnp/miniupnpc/upnperrors.c \
$(EXTDIR)/miniupnp/miniupnpc/upnpreplyparse.c
$(EXTDIR)/miniupnp/miniupnpc/src/addr_is_reserved.c \
$(EXTDIR)/miniupnp/miniupnpc/src/connecthostport.c \
$(EXTDIR)/miniupnp/miniupnpc/src/igd_desc_parse.c \
$(EXTDIR)/miniupnp/miniupnpc/src/minisoap.c \
$(EXTDIR)/miniupnp/miniupnpc/src/minissdpc.c \
$(EXTDIR)/miniupnp/miniupnpc/src/miniupnpc.c \
$(EXTDIR)/miniupnp/miniupnpc/src/miniwget.c \
$(EXTDIR)/miniupnp/miniupnpc/src/minixml.c \
$(EXTDIR)/miniupnp/miniupnpc/src/minixmlvalid.c \
$(EXTDIR)/miniupnp/miniupnpc/src/portlistingparse.c \
$(EXTDIR)/miniupnp/miniupnpc/src/receivedata.c \
$(EXTDIR)/miniupnp/miniupnpc/src/upnpcommands.c \
$(EXTDIR)/miniupnp/miniupnpc/src/upnpdev.c \
$(EXTDIR)/miniupnp/miniupnpc/src/upnperrors.c \
$(EXTDIR)/miniupnp/miniupnpc/src/upnpreplyparse.c
SOURCES_CXX += \
$(GPUDIR)/Vulkan/DrawEngineVulkan.cpp \