ShuriZma
/
quickerNES
mirror of https://github.com/SergioMartin86/quickerNES.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing build in jaffarPlus

This commit is contained in:
Sergio Martin 2024-02-08 19:30:37 +01:00
parent d1cc638517
commit 318e1822bd
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
meson.build
View File

@ -13,6 +13,15 @@ subdir('source')
# Common application flags # Common application flags
commonCompileArgs = [ '-Wfatal-errors', '-Wall'] commonCompileArgs = [ '-Wfatal-errors', '-Wall']
# Common includes
commonIncludes = include_directories(['extern'])
# Common sources
commonSources = [
'extern/jaffarCommon/extern/metrohash128/metrohash128.cpp',
'extern/jaffarCommon/extern/xdelta3/xdelta3.c',
]
# Building playback tool # Building playback tool
quickerNESPlayerSrc = [ quickerNESPlayerSrc = [
@ -30,7 +39,8 @@ if meson.is_subproject() == false
cpp_args : [ commonCompileArgs, '-DNCURSES' ], cpp_args : [ commonCompileArgs, '-DNCURSES' ],
dependencies : [ quickerNESDependency, toolDependency, dependency('sdl2'), dependency('SDL2_image') ], dependencies : [ quickerNESDependency, toolDependency, dependency('sdl2'), dependency('SDL2_image') ],
link_args : [ '-lncurses' ], link_args : [ '-lncurses' ],
sources : quickerNESPlayerSrc sources : [ commonSources, quickerNESPlayerSrc ],
include_directories : [ commonIncludes ]
) )
endif endif
@ -40,6 +50,8 @@ if meson.is_subproject() == false
'source/tester.cpp', 'source/tester.cpp',
cpp_args : [ commonCompileArgs, '-Werror' ], cpp_args : [ commonCompileArgs, '-Werror' ],
dependencies : [ quickerNESDependency, toolDependency ], dependencies : [ quickerNESDependency, toolDependency ],
sources : [ commonSources ],
include_directories : [ commonIncludes ]
) )
# Building tester tool for the original QuickNES # Building tester tool for the original QuickNES
@ -48,6 +60,8 @@ if meson.is_subproject() == false
'source/tester.cpp', 'source/tester.cpp',
cpp_args : [ commonCompileArgs, '-w', '-DDISABLE_AUTO_FILE', '-D__LIBRETRO__', '-DNDEBUG', '-DBLARGG_NONPORTABLE' ], cpp_args : [ commonCompileArgs, '-w', '-DDISABLE_AUTO_FILE', '-D__LIBRETRO__', '-DNDEBUG', '-DBLARGG_NONPORTABLE' ],
dependencies : [ quickNESDependency, toolDependency ], dependencies : [ quickNESDependency, toolDependency ],
sources : [ commonSources ],
include_directories : [ commonIncludes ]
) )
# Building tests # Building tests

6
source/meson.build
View File

@ -5,9 +5,5 @@ subdir('quickerNES')
# Tool Configuration # Tool Configuration
toolDependency = declare_dependency( toolDependency = declare_dependency(
include_directories : include_directories(['.', '../extern']), include_directories : include_directories(['.']),
sources : [
'../extern/jaffarCommon/extern/metrohash128/metrohash128.cpp',
'../extern/jaffarCommon/extern/xdelta3/xdelta3.c',
]
) )