Skip to content

Commit b9e54fb

Browse files
committed
Fix libretro builds with CMake 4
1 parent 6f6d004 commit b9e54fb

File tree

2 files changed

+24
-0
lines changed

2 files changed

+24
-0
lines changed

meson.build

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ if is_libretro
284284

285285
boost_options = cmake.subproject_options()
286286
boost_options.add_cmake_defines({
287+
'CMAKE_POLICY_VERSION_MINIMUM': '3.5',
287288
'CMAKE_C_FLAGS': ' '.join(libretro_defines + libretro_cflags),
288289
'CMAKE_CXX_FLAGS': ' '.join(libretro_defines + libretro_cppflags),
289290
'CMAKE_POSITION_INDEPENDENT_CODE': use_pic,
@@ -292,6 +293,7 @@ if is_libretro
292293

293294
zlib_options = cmake.subproject_options()
294295
zlib_options.add_cmake_defines({
296+
'CMAKE_POLICY_VERSION_MINIMUM': '3.5',
295297
'CMAKE_C_FLAGS': ' '.join(libretro_defines + libretro_cflags),
296298
'CMAKE_CXX_FLAGS': ' '.join(libretro_defines + libretro_cppflags),
297299
'CMAKE_POSITION_INDEPENDENT_CODE': use_pic,
@@ -301,6 +303,7 @@ if is_libretro
301303

302304
libzip_options = cmake.subproject_options()
303305
libzip_options.add_cmake_defines({
306+
'CMAKE_POLICY_VERSION_MINIMUM': '3.5',
304307
'CMAKE_C_FLAGS': ' '.join(libretro_defines + libretro_cflags),
305308
'CMAKE_CXX_FLAGS': ' '.join(libretro_defines + libretro_cppflags),
306309
'CMAKE_POSITION_INDEPENDENT_CODE': use_pic,
@@ -324,6 +327,7 @@ if is_libretro
324327

325328
physfs_options = cmake.subproject_options()
326329
physfs_options.add_cmake_defines({
330+
'CMAKE_POLICY_VERSION_MINIMUM': '3.5',
327331
'CMAKE_C_FLAGS': ' '.join(libretro_defines + libretro_cflags),
328332
'CMAKE_CXX_FLAGS': ' '.join(libretro_defines + libretro_cppflags),
329333
'CMAKE_POSITION_INDEPENDENT_CODE': use_pic,
@@ -335,6 +339,7 @@ if is_libretro
335339

336340
openal_options = cmake.subproject_options()
337341
openal_options.add_cmake_defines({
342+
'CMAKE_POLICY_VERSION_MINIMUM': '3.5',
338343
'CMAKE_C_FLAGS': ' '.join(libretro_defines + libretro_cflags),
339344
'CMAKE_CXX_FLAGS': ' '.join(libretro_defines + libretro_cppflags),
340345
'CMAKE_POSITION_INDEPENDENT_CODE': use_pic,
@@ -368,6 +373,7 @@ if is_libretro
368373

369374
fluidlite_options = cmake.subproject_options()
370375
fluidlite_options.add_cmake_defines({
376+
'CMAKE_POLICY_VERSION_MINIMUM': '3.5',
371377
'CMAKE_C_FLAGS': ' '.join(libretro_defines + libretro_cflags),
372378
'CMAKE_CXX_FLAGS': ' '.join(libretro_defines + libretro_cppflags),
373379
'CMAKE_POSITION_INDEPENDENT_CODE': use_pic,
@@ -377,6 +383,7 @@ if is_libretro
377383

378384
ogg_options = cmake.subproject_options()
379385
ogg_options.add_cmake_defines({
386+
'CMAKE_POLICY_VERSION_MINIMUM': '3.5',
380387
'CMAKE_C_FLAGS': ' '.join(libretro_defines + libretro_cflags),
381388
'CMAKE_CXX_FLAGS': ' '.join(libretro_defines + libretro_cppflags),
382389
'CMAKE_POSITION_INDEPENDENT_CODE': use_pic,
@@ -387,6 +394,7 @@ if is_libretro
387394

388395
vorbis_options = cmake.subproject_options()
389396
vorbis_options.add_cmake_defines({
397+
'CMAKE_POLICY_VERSION_MINIMUM': '3.5',
390398
'CMAKE_C_FLAGS': ' '.join(libretro_defines + libretro_cflags),
391399
'CMAKE_CXX_FLAGS': ' '.join(libretro_defines + libretro_cppflags),
392400
'CMAKE_POSITION_INDEPENDENT_CODE': use_pic,
@@ -397,6 +405,7 @@ if is_libretro
397405

398406
flac_options = cmake.subproject_options()
399407
flac_options.add_cmake_defines({
408+
'CMAKE_POLICY_VERSION_MINIMUM': '3.5',
400409
'CMAKE_C_FLAGS': ' '.join(libretro_defines + libretro_cflags),
401410
'CMAKE_CXX_FLAGS': ' '.join(libretro_defines + libretro_cppflags),
402411
'CMAKE_POSITION_INDEPENDENT_CODE': use_pic,
@@ -416,6 +425,7 @@ if is_libretro
416425

417426
opus_options = cmake.subproject_options()
418427
opus_options.add_cmake_defines({
428+
'CMAKE_POLICY_VERSION_MINIMUM': '3.5',
419429
'CMAKE_C_FLAGS': ' '.join(libretro_defines + libretro_cflags),
420430
'CMAKE_CXX_FLAGS': ' '.join(libretro_defines + libretro_cppflags),
421431
'CMAKE_POSITION_INDEPENDENT_CODE': use_pic,
@@ -434,6 +444,7 @@ if is_libretro
434444

435445
mpg123_options = cmake.subproject_options()
436446
mpg123_options.add_cmake_defines({
447+
'CMAKE_POLICY_VERSION_MINIMUM': '3.5',
437448
'CMAKE_C_FLAGS': ' '.join(libretro_defines + libretro_cflags),
438449
'CMAKE_CXX_FLAGS': ' '.join(libretro_defines + libretro_cppflags),
439450
'CMAKE_POSITION_INDEPENDENT_CODE': use_pic,
@@ -446,6 +457,7 @@ if is_libretro
446457

447458
libsndfile_options = cmake.subproject_options()
448459
libsndfile_options.add_cmake_defines({
460+
'CMAKE_POLICY_VERSION_MINIMUM': '3.5',
449461
'CMAKE_C_FLAGS': ' '.join(libretro_defines + libretro_cflags),
450462
'CMAKE_CXX_FLAGS': ' '.join(libretro_defines + libretro_cppflags),
451463
'CMAKE_POSITION_INDEPENDENT_CODE': use_pic,
@@ -464,6 +476,7 @@ if is_libretro
464476

465477
pixman_region_options = cmake.subproject_options()
466478
pixman_region_options.add_cmake_defines({
479+
'CMAKE_POLICY_VERSION_MINIMUM': '3.5',
467480
'CMAKE_C_FLAGS': ' '.join(libretro_defines + libretro_cflags),
468481
'CMAKE_CXX_FLAGS': ' '.join(libretro_defines + libretro_cppflags),
469482
'CMAKE_POSITION_INDEPENDENT_CODE': use_pic,

subprojects/packagefiles/vorbis-deps.patch

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,17 @@
2222

2323
typedef struct vorbis_info{
2424
int version;
25+
--- a/lib/CMakeLists.txt
26+
+++ b/lib/CMakeLists.txt
27+
@@ -106,7 +106,7 @@ if (NOT BUILD_FRAMEWORK)
28+
)
29+
30+
target_link_libraries(vorbis
31+
- PUBLIC Ogg::ogg
32+
+
33+
PRIVATE $<$<BOOL:${HAVE_LIBM}>:m>
34+
)
35+
target_link_libraries(vorbisenc PUBLIC vorbis)
2536
--- a/lib/analysis.c
2637
+++ b/lib/analysis.c
2738
@@ -17,7 +17,7 @@

0 commit comments

Comments
 (0)