Skip to content

Commit 4218062

Browse files
committed
meson: use compile_args in preprocess() [#146]
This requires meson-1.3.2.
1 parent 091c157 commit 4218062

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

fdpp.spec.rpkg

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ URL: https://github.com/dosemu2/fdpp
1414
VCS: {{{ git_dir_vcs }}}
1515
Source0: {{{ dir_pack }}}
1616

17-
BuildRequires: meson >= 1.3.0
17+
BuildRequires: meson >= 1.3.2
1818
BuildRequires: ninja-build
1919
BuildRequires: sed
2020
BuildRequires: bash

fdpp/kernel/meson.build

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
project('kernel', ['nasm', 'c'], version: '1.7')
1+
project('kernel', ['nasm', 'c'], version: '1.7', meson_version: '>= 1.3.2')
2+
23
PD = 'parsers/parse_decls.sh'
34
SRC = 'src'
45
DSRC = 'src/drivers'
@@ -21,12 +22,11 @@ incdir2 = include_directories(hdr)
2122
sfiles = cpp.preprocess(['cdata.S', 'plt.S'],
2223
output : '@[email protected]',
2324
include_directories: incdir2,
24-
dependencies: declare_dependency(
25-
compile_args : [
25+
compile_args : [
2626
'-D__ASSEMBLER__',
2727
'-DKERNEL_VERSION=' + meson.project_version() +
2828
' [GIT: ' + GIT_DESCRIBE + ']',
29-
'-DCMA=,', '-P']))
29+
'-DCMA=,', '-P'])
3030
env = environment()
3131
env.set('CPP', 'cpp')
3232
env.set('srcdir', meson.current_source_dir() / '../parsers')

0 commit comments

Comments
 (0)