Merge pull request #21985 from kreinholz/master

Fix build when USE_SYSTEM_MINIUPNPC cmake option is enabled.

CMakeLists.txt

@@ -220,6 +220,10 @@ if(USE_SYSTEM_RAPIDJSON)
 	add_compile_definitions(SYSTEM_RAPIDJSON)
 endif()
 
+if(USE_SYSTEM_MINIUPNPC)
+	add_compile_definitions(USE_SYSTEM_MINIUPNPC)
+endif()
+
 if(WEBOS)
 	set(USING_X11_VULKAN OFF)
 	set(USING_GLES2 ON)

Core/CMakeLists.txt

@@ -179,7 +179,7 @@ endif()
 if(USE_MINIUPNPC)
 	if(USE_SYSTEM_MINIUPNPC)
 		find_package(MINIUPNPC REQUIRED)
-		add_compile_definitions(WITH_UPNP USE_SYSTEM_MINIUPNPC)
+		add_compile_definitions(WITH_UPNP)
 	else()
 		set (MINIUPNPC_VERSION 2.2) # used by miniupnpcstrings.h.cmake
 		set (MINIUPNPC_API_VERSION 18)

SDL/SDLMain.cpp

@@ -931,6 +931,8 @@ std::vector<std::string> System_GetCameraDeviceList() {
 	return __mac_getDeviceList();
 #elif PPSSPP_PLATFORM(LINUX) && !PPSSPP_PLATFORM(ANDROID)
 	return __v4l_getDeviceList();
+#else
+	return {};
 #endif
 }