From f3acc28992b04d69c35d7948d413dd31cd2d9668 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 28 May 2025 03:07:22 +0200 Subject: [PATCH] windoze things --- src/Makefile.d/features.mk | 10 ++++++---- src/Makefile.d/win32.mk | 11 +++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/Makefile.d/features.mk b/src/Makefile.d/features.mk index c4706e2f5..c10fb9dce 100644 --- a/src/Makefile.d/features.mk +++ b/src/Makefile.d/features.mk @@ -24,10 +24,6 @@ ifndef NOMD5 sources+=md5.c endif -ifndef NOOPENMPT -HAVE_OPENMPT=1 -endif - ifdef NOBLUAJIT opts+=-DNOBLUAJIT endif @@ -71,6 +67,12 @@ HAVE_MINIUPNPC=1 opts+=-DHAVE_MINIUPNPC endif +ifdef MINGW +ifndef NODISCORDRPC +HAVE_DISCORDRPC=1 +endif +endif + ifdef HAVE_DISCORDRPC $(eval $(call Propogate_flags,DISCORDRPC)) libs+=-ldiscord-rpc diff --git a/src/Makefile.d/win32.mk b/src/Makefile.d/win32.mk index bd76822cb..b08834ab4 100644 --- a/src/Makefile.d/win32.mk +++ b/src/Makefile.d/win32.mk @@ -59,15 +59,19 @@ $(1)_CFLAGS?=$($(1)_opts) $(1)_LDFLAGS?=$($(1)_libs) endef +ifdef HAVE_GME lib:=../libs/gme LIBGME_opts:=-I$(lib)/include LIBGME_libs:=-L$(lib)/win$(32) -lgme $(eval $(call _set,LIBGME)) +endif +ifdef HAVE_OPENMPT lib:=../libs/libopenmpt LIBOPENMPT_opts:=-I$(lib)/inc LIBOPENMPT_libs:=-L$(lib)/lib/$(x86)/mingw -lopenmpt $(eval $(call _set,LIBOPENMPT)) +endif lib:=../libs/SDL2_mixer/$(mingw) @@ -124,3 +128,10 @@ MINIUPNPC_opts:=-I$(lib)/include -DMINIUPNP_STATICLIB MINIUPNPC_libs:=-L$(lib)/mingw$(32) -lminiupnpc -lws2_32 -liphlpapi $(eval $(call _set,MINIUPNPC)) endif + +ifdef HAVE_DISCORDRPC +lib:=../libs/discord-rpc/win$(32)-dynamic/ +DRPC_opts+=-I$(lib)/include +DRPC_libs+=-L$(lib)/lib -ldiscord-rpc +$(eval $(call _set,DRPC)) +endif