From 88fd5ca790e6628535b0e7e2b96301f85dc41eb6 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 9 Nov 2023 13:38:38 -0500
Subject: [PATCH] Makefile: fix Win32.mk to have the right vars for the 5
 FFmpeg libraries

---
 src/Makefile.d/features.mk | 10 +++++-----
 src/Makefile.d/win32.mk    | 24 +++++++++++++++++++++---
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/Makefile.d/features.mk b/src/Makefile.d/features.mk
index 711e03ac3..949b07a87 100644
--- a/src/Makefile.d/features.mk
+++ b/src/Makefile.d/features.mk
@@ -65,11 +65,11 @@ default_packages:=\
 	GME/libgme/LIBGME\
 	OPENMPT/libopenmpt/LIBOPENMPT\
 	ZLIB/zlib\
-	LIBAVCODEC/libavcodec\
-	LIBAVFORMAT/libavformat\
-	LIBAVUTIL/libavutil\
-	LIBSWRESAMPLE/libswresample\
-	LIBSWSCALE/libswscale\
+	AVCODEC/libavcodec\
+	AVFORMAT/libavformat\
+	AVUTIL/libavutil\
+	SWRESAMPLE/libswresample\
+	SWSCALE/libswscale\
 
 $(foreach p,$(default_packages),\
 	$(eval $(call Check_pkg_config,$(p))))
diff --git a/src/Makefile.d/win32.mk b/src/Makefile.d/win32.mk
index db68d0de3..b3fb71d99 100644
--- a/src/Makefile.d/win32.mk
+++ b/src/Makefile.d/win32.mk
@@ -102,6 +102,24 @@ CURL_libs:=-L$(lib)/lib$(32) -lcurl
 $(eval $(call _set,CURL))
 
 lib:=../libs/ffmpeg
-FFMPEG_opts:=-I$(lib)/include
-FFMPEG_libs:=-L$(lib)/lib -lavcodec-59 -lavformat-59 -lavutil-57 -lswresample-4 -lswscale-6
-$(eval $(call _set,FFMPEG))
+#$(eval $(call _set,FFMPEG))
+
+AVCODEC_opts:=-I$(lib)/include
+AVCODEC_libs:=-L$(lib)/lib$(32) -lavcodec-59
+$(eval $(call _set,AVCODEC))
+
+AVFORMAT_opts:=-I$(lib)/include
+AVFORMAT_libs:=-L$(lib)/lib$(32) -lavformat-59
+$(eval $(call _set,AVFORMAT))
+
+AVUTIL_opts:=-I$(lib)/include
+AVUTIL_libs:=-L$(lib)/lib$(32) -lavutil-57
+$(eval $(call _set,AVUTIL))
+
+SWRESAMPLE_opts:=-I$(lib)/include
+SWRESAMPLE_libs:=-L$(lib)/lib$(32) -lswresample-4
+$(eval $(call _set,SWRESAMPLE))
+
+SWSCALE_opts:=-I$(lib)/include
+SWSCALE_libs:=-L$(lib)/lib$(32) -lswscale-6
+$(eval $(call _set,SWSCALE))