Commit graph

4 commits

Author SHA1 Message Date
Eidolon
a4f618b052 cmake: Fix png and openmpt builds in clean envs
In environments without zlib installed, png would fail to build since
it can't find zlib.h. The zlib build's generated public include dir
needs zlib.h to work.

openmpt fails to build because it can't find Rpcrt4, which is not a
necessary link under mingw, but exists in some mingw-w64 toolchains.
It is only needed for MSVC.

(cherry picked from commit fcf69001ada08077f82d3fc8510dcd24b4433e64)
2024-10-15 03:42:15 -04:00
Eidolon
475215dec4 cmake: Use MAME YM2612 emu in GME
(cherry picked from commit fb0f0c5e6c161b4b88439cda84c8b6cae9d236cc)
2024-10-15 03:42:07 -04:00
Eidolon
9b2a590938 Cherry-pick internal zlib MR from SRB2/next
cmake: build zlib manually in internal build

See merge request STJr/SRB2!1856

(cherry picked from commit 3597957af13878854c02305a0aec5ca744209ef2)

# Conflicts:
#	thirdparty/CMakeLists.txt
2024-10-15 03:41:53 -04:00
Sal
4d1add7e4c Merge branch 'cmake-overhaul' into 'master'
cmake: Rollup of srb2-side changes

See merge request KartKrew/Kart!758
2024-10-15 03:40:29 -04:00