Skip to content

Commit

Permalink
meson: use compile_args in preprocess() [#146]
Browse files Browse the repository at this point in the history
This requires meson-1.3.2.
  • Loading branch information
stsp committed Apr 18, 2024
1 parent 091c157 commit 4218062
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion fdpp.spec.rpkg
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ URL: https://github.com/dosemu2/fdpp
VCS: {{{ git_dir_vcs }}}
Source0: {{{ dir_pack }}}

BuildRequires: meson >= 1.3.0
BuildRequires: meson >= 1.3.2
BuildRequires: ninja-build
BuildRequires: sed
BuildRequires: bash
Expand Down
8 changes: 4 additions & 4 deletions fdpp/kernel/meson.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
project('kernel', ['nasm', 'c'], version: '1.7')
project('kernel', ['nasm', 'c'], version: '1.7', meson_version: '>= 1.3.2')

PD = 'parsers/parse_decls.sh'
SRC = 'src'
DSRC = 'src/drivers'
Expand All @@ -21,12 +22,11 @@ incdir2 = include_directories(hdr)
sfiles = cpp.preprocess(['cdata.S', 'plt.S'],
output : '@[email protected]',
include_directories: incdir2,
dependencies: declare_dependency(
compile_args : [
compile_args : [
'-D__ASSEMBLER__',
'-DKERNEL_VERSION=' + meson.project_version() +
' [GIT: ' + GIT_DESCRIBE + ']',
'-DCMA=,', '-P']))
'-DCMA=,', '-P'])
env = environment()
env.set('CPP', 'cpp')
env.set('srcdir', meson.current_source_dir() / '../parsers')
Expand Down

0 comments on commit 4218062

Please sign in to comment.