From 78dee58811deb5483e9245626f40d67800bd2243 Mon Sep 17 00:00:00 2001 From: Flyinghead Date: Mon, 28 Dec 2020 21:37:51 +0100 Subject: [PATCH] still trying: win32 build fix --- shell/linux/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/shell/linux/Makefile b/shell/linux/Makefile index b74c6b4d3..2199997c8 100644 --- a/shell/linux/Makefile +++ b/shell/linux/Makefile @@ -322,9 +322,9 @@ ifdef USE_MODEM $(RZDCY_SRC_DIR)/deps/miniupnpc/libminiupnpc.a: ifdef FOR_WINDOWS - cd $(RZDCY_SRC_DIR)/deps/miniupnpc; mingw32-make -f Makefile.mingw libminiupnpc.a + $(MAKE) -C $(RZDCY_SRC_DIR)/deps/miniupnpc -f Makefile.mingw CC=gcc libminiupnpc.a else - cd $(RZDCY_SRC_DIR)/deps/miniupnpc; make libminiupnpc.a + $(MAKE) -C $(RZDCY_SRC_DIR)/deps/miniupnpc libminiupnpc.a endif endif @@ -467,12 +467,13 @@ OBJECTS:=$(OBJECTS:.S=.build_obj) OBJECTS:=$(patsubst $(RZDCY_SRC_DIR)/%,$(BUILDDIR)/%,$(OBJECTS)) ifdef FOR_WINDOWS -OBJECTS+=$(BUILDDIR)/reicastres.build_obj +OBJECTS += $(BUILDDIR)/reicastres.build_obj $(BUILDDIR)/reicastres.build_obj: $(LOCAL_PATH)/../windows/reicast.rc $(LOCAL_PATH)/../windows/flycast.ico $(RZDCY_SRC_DIR)/version.h $(WINDRES) $< $@ ifdef USE_MODEM -OBJECTS+=$(RZDCY_SRC_DIR)/deps/miniupnpc/libminiupnpc.a +OBJECTS += $(RZDCY_SRC_DIR)/deps/miniupnpc/libminiupnpc.a +CFLAGS += -DMINIUPNP_STATICLIB endif endif