From 20d10187cd9b0172b5ac98288c08856e3e8576d0 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 24 Jul 2020 08:54:51 +0200 Subject: [PATCH] (Libretro Windows) Buildfix --- libretro/Makefile | 6 +++--- libretro/jni/Android.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libretro/Makefile b/libretro/Makefile index eaf1085a81..8b2d15fa49 100644 --- a/libretro/Makefile +++ b/libretro/Makefile @@ -374,7 +374,7 @@ else ifneq (,$(findstring windows_msvc2017,$(platform))) FFMPEGLIBDIR := $(FFMPEGDIR)/Windows/$(TARGET_ARCH)/lib FFMPEGLDFLAGS += -LIBPATH:$(FFMPEGLIBDIR) GL_LIB := opengl32.lib - 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 + 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 MSVC 2019 all architectures else ifneq (,$(findstring windows_msvc2019,$(platform))) @@ -481,7 +481,7 @@ else ifneq (,$(findstring windows_msvc2019,$(platform))) FFMPEGLIBDIR := $(FFMPEGDIR)/Windows/$(TARGET_ARCH)/lib FFMPEGLDFLAGS += -LIBPATH:$(FFMPEGLIBDIR) GL_LIB := opengl32.lib - 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 + 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))) @@ -512,7 +512,7 @@ else GLFLAGS += -DHAVE_OPENGL endif -COREFLAGS += -D__LIBRETRO__ -DPPSSPP -DUSE_FFMPEG -DGLEW_STATIC -DGLEW_NO_GLU +COREFLAGS += -D__LIBRETRO__ -DPPSSPP -DUSE_FFMPEG -DGLEW_STATIC -DGLEW_NO_GLU -DMINIUPNP_STATICLIB ifeq ($(DEBUG), 1) ifneq (,$(findstring msvc,$(platform))) diff --git a/libretro/jni/Android.mk b/libretro/jni/Android.mk index e9b773c024..e1b48c2f7a 100644 --- a/libretro/jni/Android.mk +++ b/libretro/jni/Android.mk @@ -71,7 +71,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 $(INCFLAGS) +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) 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)