Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Play FMVs using ffmpeg instead of smackw32.dll #3573

Merged
merged 5 commits into from
Nov 14, 2024
Merged

Play FMVs using ffmpeg instead of smackw32.dll #3573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
060a864
Play FMVs using ffmpeg instead of smackw32.dll
xtremeqg Oct 8, 2024
b3580f4
Added .git suffix to submdule url
xtremeqg Oct 18, 2024
0cfcec9
Build minimal dynamic library of ffmpeg
xtremeqg Oct 18, 2024
93f285a
Merge branch 'master' into ffmpeg
xtremeqg Nov 13, 2024
d9dc9c3
Compatibility fix for mingw32 10 and lower
xtremeqg Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,5 @@ res/keeperfx_icon.ico
/deps/spng
/deps/astronomy
/deps/centijson
/deps/ffmpeg
/deps/*.tar.gz
17 changes: 15 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,12 +343,16 @@ CU_OBJS = \
# include and library directories
LINKLIB = -mwindows \
-L"sdl/lib" -lSDL2 -lSDL2_mixer -lSDL2_net -lSDL2_image \
-L"deps/ffmpeg/libavformat" -lavformat \
-L"deps/ffmpeg/libavcodec" -lavcodec \
-L"deps/ffmpeg/libswresample" -lswresample \
-L"deps/ffmpeg/libavutil" -lavutil \
-L"deps/astronomy" -lastronomy \
-L"deps/enet" -lenet \
-L"deps/spng" -lspng \
-L"deps/centijson" -ljson \
-L"deps/zlib" -lminizip -lz \
-lwinmm -lmingw32 -limagehlp -lws2_32 -ldbghelp
-lwinmm -lmingw32 -limagehlp -lws2_32 -ldbghelp -lbcrypt
INCS = \
-I"deps/zlib/include" \
-I"deps/spng/include" \
Expand All @@ -358,6 +362,7 @@ INCS = \
-I"deps/centijson/include" \
-I"deps/centitoml" \
-I"deps/astronomy/include" \
-I"deps/ffmpeg" \
-I"obj" # To find ver_defs.h
CXXINCS = $(INCS)

Expand Down Expand Up @@ -581,7 +586,7 @@ clean-libexterns: libexterns.mk
-$(RM) -rf deps/enet deps/zlib deps/spng deps/astronomy deps/centijson
-$(RM) libexterns

deps/enet deps/zlib deps/spng deps/astronomy deps/centijson:
deps/enet deps/zlib deps/spng deps/astronomy deps/centijson deps/ffmpeg:
$(MKDIR) $@

src/api.c: deps/centijson/include/json.h
Expand All @@ -590,6 +595,8 @@ src/custom_sprites.c: deps/zlib/include/zlib.h deps/spng/include/spng.h deps/cen
src/moonphase.c: deps/astronomy/include/astronomy.h
deps/centitoml/toml_api.c: deps/centijson/include/json.h
deps/centitoml/toml_conv.c: deps/centijson/include/json.h
src/bflib_fmvids.cpp: deps/ffmpeg/libavformat/avformat.h
obj/std/bflib_fmvids.o obj/hvlog/bflib_fmvids.o: CXXFLAGS += -Wno-error=deprecated-declarations

deps/enet-mingw32.tar.gz:
curl -Lso $@ "https://github.com/dkfans/kfx-deps/releases/download/initial/enet-mingw32.tar.gz"
Expand Down Expand Up @@ -621,6 +628,12 @@ deps/centijson-mingw32.tar.gz:
deps/centijson/include/json.h: deps/centijson-mingw32.tar.gz | deps/centijson
tar xzmf $< -C deps/centijson

deps/ffmpeg-mingw32.tar.gz:
curl -Lso $@ "https://github.com/dkfans/kfx-deps/releases/download/initial/ffmpeg-mingw32.tar.gz"

deps/ffmpeg/libavformat/avformat.h: deps/ffmpeg-mingw32.tar.gz | deps/ffmpeg
tar xzmf $< -C deps/ffmpeg

include tool_png2ico.mk
include tool_pngpal2raw.mk
include tool_png2bestpal.mk
Expand Down
Loading
Loading