From dc873bbd420795e66ba98768dbfe74ab37cf26cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Sat, 20 Mar 2021 13:46:45 +0100
Subject: [PATCH] Add missing -DWITH_UPNP in a couple more places.

---
 android/jni/Locals.mk   |  2 +-
 libretro/Makefile       | 20 ++++++++++----------
 libretro/jni/Android.mk |  3 +--
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/android/jni/Locals.mk b/android/jni/Locals.mk
index 0841c6cb3e..44e8f57cf8 100644
--- a/android/jni/Locals.mk
+++ b/android/jni/Locals.mk
@@ -1,7 +1,7 @@
 # These are definitions for LOCAL_ variables for PPSSPP.
 # They are shared between ppsspp_jni (lib for Android app) and ppsspp_headless.
 
-LOCAL_CFLAGS := -DUSE_FFMPEG -DUSING_GLES2 -DMOBILE_DEVICE -O3 -fsigned-char -Wall -Wno-multichar -Wno-unused-variable -fno-strict-aliasing -D__STDC_CONSTANT_MACROS -Wno-format -DSPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS
+LOCAL_CFLAGS := -DUSE_FFMPEG -DWITH_UPNP -DUSING_GLES2 -DMOBILE_DEVICE -O3 -fsigned-char -Wall -Wno-multichar -Wno-unused-variable -fno-strict-aliasing -D__STDC_CONSTANT_MACROS -Wno-format -DSPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS
 # yes, it's really CPPFLAGS for C++
 # deprecated-register is generated by Android default code and causes noise.
 LOCAL_CPPFLAGS := -fno-exceptions -std=gnu++11 -fno-rtti -Wno-reorder -Wno-format -Wno-deprecated-register
diff --git a/libretro/Makefile b/libretro/Makefile
index a79d4f71ea..6cd3173449 100644
--- a/libretro/Makefile
+++ b/libretro/Makefile
@@ -81,11 +81,11 @@ else ifneq (,$(findstring rpi,$(platform)))
 	GLES = 1
 	GL_LIB := -lGLESv2
 	INCFLAGS += -I/opt/vc/include
-	CPUFLAGS += -DARMv5_ONLY 
+	CPUFLAGS += -DARMv5_ONLY
 	PLATFORM_EXT := unix
 	TARGET_ARCH = arm
 	LDFLAGS += -lrt -ldl
-	
+
 # ARM64
 else ifneq (,$(findstring arm64,$(platform)))
 	TARGET := $(TARGET_NAME)_libretro.so
@@ -115,7 +115,7 @@ else ifneq (,$(findstring imx6,$(platform)))
 	fpic = -fPIC
 	GLES = 1
 	GL_LIB := -lGLESv2
-	CPUFLAGS += 
+	CPUFLAGS +=
 	PLATFORM_EXT := unix
 	TARGET_ARCH = arm
 	HAVE_NEON=1
@@ -185,8 +185,8 @@ else ifneq (,$(findstring android,$(platform)))
 	CXX = arm-linux-androideabi-g++
 	TARGET_ARCH = arm
 	GLES = 1
-	PLATCFLAGS += -DANDROID 
-	CPUCFLAGS  += 
+	PLATCFLAGS += -DANDROID
+	CPUCFLAGS  +=
 	HAVE_NEON = 1
 	CPUFLAGS += -marm -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp -D__arm__ -DARM_ASM -D__NEON_OPT
 	CFLAGS += -DANDROID
@@ -257,7 +257,7 @@ else ifneq (,$(findstring armv,$(platform)))
 else ifeq ($(platform), emscripten)
 	TARGET := $(TARGET_NAME)_libretro_emscripten.bc
 	GLES := 1
-	CPUFLAGS += 
+	CPUFLAGS +=
 	PLATCFLAGS += -DCC_resampler=mupen_CC_resampler -Dsinc_resampler=mupen_sinc_resampler \
 					-Drglgen_symbol_map=mupen_rglgen_symbol_map -Dmain_exit=mupen_main_exit \
 					-Dadler32=mupen_adler32 -Drarch_resampler_realloc=mupen_rarch_resampler_realloc \
@@ -281,7 +281,7 @@ else ifneq (,$(findstring windows_msvc2017,$(platform)))
 		LDFLAGS += -APPCONTAINER -NXCOMPAT -DYNAMICBASE -MANIFEST:NO -OPT:REF -SUBSYSTEM:CONSOLE -MANIFESTUAC:NO -OPT:ICF -ERRORREPORT:PROMPT -NOLOGO -TLBID:1 -DEBUG:FULL -WINMD:NO
 		LIBS += WindowsApp.lib
 	endif
-	
+
 	ifeq ($(DEBUG), 1)
 		MSVC2017CompileFlags += -DEBUG
 	endif
@@ -489,7 +489,7 @@ else ifneq (,$(findstring windows_msvc2019,$(platform)))
 	LDFLAGS += ws2_32.lib user32.lib shell32.lib avcodec.lib avutil.lib swresample.lib swscale.lib avformat.lib advapi32.lib winmm.lib gdi32.lib d3d9.lib d3dx9.lib Iphlpapi.lib
 
 # Windows
-else ifneq (,$(findstring win,$(platform)))   
+else ifneq (,$(findstring win,$(platform)))
 	TARGET := $(TARGET_NAME)_libretro.dll
 	CFLAGS += -D_UNICODE -DUNICODE
 	CXXFLAGS += -fpermissive -Wno-multichar -D_UNICODE -DUNICODE
@@ -517,7 +517,7 @@ else
 	GLFLAGS += -DHAVE_OPENGL
 endif
 
-COREFLAGS += -D__LIBRETRO__ -DPPSSPP -DUSE_FFMPEG -DGLEW_STATIC -DGLEW_NO_GLU -DMINIUPNP_STATICLIB
+COREFLAGS += -D__LIBRETRO__ -DPPSSPP -DUSE_FFMPEG -DWITH_UPNP -DGLEW_STATIC -DGLEW_NO_GLU -DMINIUPNP_STATICLIB
 
 ifeq ($(DEBUG), 1)
 	ifneq (,$(findstring msvc,$(platform)))
@@ -546,7 +546,7 @@ ifeq (,$(findstring android,$(platform))$(findstring msvc,$(platform)))
 endif
 
 OBJOUT   = -o
-LINKOUT  = -o 
+LINKOUT  = -o
 
 ifneq (,$(findstring msvc,$(platform)))
 	OBJOUT = -Fo
diff --git a/libretro/jni/Android.mk b/libretro/jni/Android.mk
index 96f0b93b40..20f39f9713 100644
--- a/libretro/jni/Android.mk
+++ b/libretro/jni/Android.mk
@@ -72,7 +72,7 @@ LOCAL_MODULE := retro
 
 include $(CORE_DIR)/libretro/Makefile.common
 
-COREFLAGS += -DINLINE="inline" -DPPSSPP -DUSE_FFMPEG -DMOBILE_DEVICE -DBAKE_IN_GIT -DDYNAREC -D__LIBRETRO__ -DUSING_GLES2 -D__STDC_CONSTANT_MACROS -DGLEW_NO_GLU -DMINIUPNP_STATICLIB $(INCFLAGS)
+COREFLAGS += -DINLINE="inline" -DPPSSPP -DUSE_FFMPEG -DWITH_UPNP -DMOBILE_DEVICE -DBAKE_IN_GIT -DDYNAREC -D__LIBRETRO__ -DUSING_GLES2 -D__STDC_CONSTANT_MACROS -DGLEW_NO_GLU -DMINIUPNP_STATICLIB $(INCFLAGS)
 LOCAL_SRC_FILES = $(SOURCES_CXX) $(SOURCES_C) $(ASMFILES)
 LOCAL_CPPFLAGS := -Wall -std=gnu++11 $(COREFLAGS) -DSPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS
 LOCAL_CFLAGS := -O2 -DANDROID $(COREFLAGS)
@@ -80,4 +80,3 @@ LOCAL_LDLIBS += -lz -llog -lGLESv2 -lEGL -latomic
 LOCAL_STATIC_LIBRARIES += $(FFMPEGLIBS)
 
 include $(BUILD_SHARED_LIBRARY)
-