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

Merge branch 'libretro-compat' into libretro

Browse source
This commit is contained in:
刘皓 2025-02-28 00:42:05 -05:00
commit d1230aab74
No known key found for this signature in database
GPG key ID: 7901753DB465B711
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
embedtool.cpp
View file

@ -41,7 +41,7 @@ int main(int argc, char **argv) {
return 3;
}
outputf << "#include <stddef.h>\n#include <stdint.h>\nconst uint8_t " << arrayname << "[] = {";
outputf << "#include <stddef.h>\n#include <stdint.h>\nextern const uint8_t " << arrayname << "[] = {";
uint64_t len = 0;
for (;;) {
@ -53,7 +53,7 @@ int main(int argc, char **argv) {
++len;
}
outputf << "};\nconst size_t " << arrayname << "_len = " << len << "ULL;";
outputf << "};\nextern const size_t " << arrayname << "_len = " << len << "ULL;";
return 0;
}

1
libretro/README.md
View file

@ -32,7 +32,6 @@ This stage produces the actual core file.
Required software:
* C and C++ compilers
* [Git](https://git-scm.com)
* [xxd](https://github.com/vim/vim/blob/master/runtime/doc/xxd.man)
* [Meson](https://mesonbuild.com)
* [Ninja](https://ninja-build.org)
* [CMake](https://cmake.org)

4
meson.build
View file

@ -14,7 +14,7 @@ endif
compilers = {'c': meson.get_compiler('c'), 'cpp': meson.get_compiler('cpp')}
global_sources = []
global_sources = [vcs_tag(command: ['git', 'rev-parse', '--short=7', 'HEAD'], fallback: 'unknown', input: 'src/git-hash.h.in', output: 'git-hash.h')]
global_dependencies = []
global_include_dirs = []
global_args = []
@ -32,8 +32,6 @@ global_args += '-DHAVE_NANOSLEEP'
# Ext libs
# ====================
global_sources += vcs_tag(command: ['git', 'rev-parse', '--short', 'HEAD'], fallback: 'unknown', input: 'src/git-hash.h.in', output: 'git-hash.h')
if is_libretro
embedtool = executable('embedtool', sources: 'embedtool.cpp', native: true, override_options: [])