mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-08-23 07:13:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'misc-fixes' into libretro

Browse source
This commit is contained in:
刘皓 2025-07-12 21:44:26 -04:00
commit c59a5905ca
No known key found for this signature in database
GPG key ID: 7901753DB465B711
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
assets/meson.build
View file

@ -11,9 +11,11 @@ endif
embedded_assets_f = files(embedded_assets) embedded_assets_f = files(embedded_assets)
embedded_assets_sources = []
count = 0 count = 0
foreach file : embedded_assets_f foreach file : embedded_assets_f
global_sources += custom_target(embedded_assets[count], embedded_assets_sources += custom_target(embedded_assets[count],
input: file, input: file,
output: '@0@.xxd'.format(embedded_assets[count]), output: '@0@.xxd'.format(embedded_assets[count]),
command: [ command: [
@ -26,6 +28,8 @@ foreach file : embedded_assets_f
count += 1 count += 1
endforeach endforeach
global_dependencies += declare_dependency(sources: embedded_assets_sources)
if is_libretro if is_libretro
global_sources += custom_target( global_sources += custom_target(
'GMGSx', 'GMGSx',

4
meson.build
View file

@ -28,8 +28,8 @@ if is_libretro and (host_cpu_family == 'ppc' or host_cpu_family == 'ppc64') and
error('LTO is required when building for PowerPC architectures. Please pass either `-Db_lto=true` or `-Druby_lto=true` to Meson.') error('LTO is required when building for PowerPC architectures. Please pass either `-Db_lto=true` or `-Druby_lto=true` to Meson.')
endif endif
global_sources = [vcs_tag(command: ['git', 'rev-parse', '--short=7', 'HEAD'], fallback: 'unknown', input: 'src/git-hash.h.in', output: 'git-hash.h')] global_sources = []
global_dependencies = [] global_dependencies = [declare_dependency(sources: vcs_tag(command: ['git', 'rev-parse', '--short=7', 'HEAD'], fallback: 'unknown', input: 'src/git-hash.h.in', output: 'git-hash.h'))]
global_include_dirs = [] global_include_dirs = []
global_args = [] global_args = []
global_cpp_args = [] global_cpp_args = []

6
shader/meson.build
View file

@ -36,9 +36,11 @@ endif
embedded_shaders_f = files(embedded_shaders) embedded_shaders_f = files(embedded_shaders)
embedded_shaders_dep_sources = []
count = 0 count = 0
foreach file : embedded_shaders_f foreach file : embedded_shaders_f
global_sources += custom_target(embedded_shaders[count], embedded_shaders_dep_sources += custom_target(embedded_shaders[count],
input: file, input: file,
output: '@0@.xxd'.format(embedded_shaders[count]), output: '@0@.xxd'.format(embedded_shaders[count]),
command: [ command: [
@ -50,3 +52,5 @@ foreach file : embedded_shaders_f
) )
count += 1 count += 1
endforeach endforeach
global_dependencies += declare_dependency(sources: embedded_shaders_dep_sources)