stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-19 18:41:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Makefile: fix Win32.mk to have the right vars for the 5 FFmpeg libraries

Browse source
This commit is contained in:
Alam Ed Arias 2023-11-09 13:38:38 -05:00
parent c284094305
commit 88fd5ca790
2 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Makefile.d/features.mk
View file

@ -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))))

24
src/Makefile.d/win32.mk
View file

@ -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))