Archive/TRX
0
0
Fork 0
mirror of https://github.com/LostArtefacts/TRX.git synced 2025-04-28 12:47:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

build: fix meson warnings

Browse source
This commit is contained in:
Marcin Kurczewski 2025-01-01 21:37:34 +01:00
parent ae498c02a0
commit b62af2d0c0
5 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/libtrx/meson.build
View file

@ -5,6 +5,7 @@ project(
'c_std=c11',
'warning_level=2',
],
meson_version: '>=1.3.0',
)
staticdeps = get_option('staticdeps')

9
src/tr1/meson.build
View file

@ -5,6 +5,7 @@ project(
'c_std=c2x',
'warning_level=2',
],
meson_version: '>=1.3.0',
)
staticdeps = get_option('staticdeps')
@ -56,21 +57,21 @@ git = find_program('git', required: true)
init = custom_target(
'fake_init',
output: ['init.c'],
command: [python3, meson.source_root() + '/../../tools/tr1/generate_init', '-o', meson.current_build_dir() / '@OUTPUT0@'],
command: [python3, meson.project_source_root() + '/../../tools/tr1/generate_init', '-o', meson.current_build_dir() / '@OUTPUT0@'],
build_always_stale: true,
)
version_rc = custom_target(
'fake_version',
output: ['version.rc'],
command: [python3, meson.source_root() + '/../../tools/tr1/generate_rcfile', '-o', '@OUTPUT0@'],
command: [python3, meson.project_source_root() + '/../../tools/tr1/generate_rcfile', '-o', '@OUTPUT0@'],
build_always_stale: true,
)
icon_rc = custom_target(
'fake_icon',
output: ['icon.rc'],
command: [python3, meson.source_root() + '/../../tools/tr1/generate_rcfile', '-o', '@OUTPUT0@'],
command: [python3, meson.project_source_root() + '/../../tools/tr1/generate_rcfile', '-o', '@OUTPUT0@'],
)
link_args = []
@ -295,7 +296,7 @@ executable(
sources,
dependencies: dependencies,
link_args: link_args,
gui_app: true,
win_subsystem: 'windows',
install: true,
)

13
src/tr2/meson.build
View file

@ -1,8 +1,11 @@
project('TR2X', ['c'],
project(
'TR2X',
['c'],
default_options: [
'c_std=c2x',
'warning_level=2',
],
meson_version: '>=1.3.0',
)
staticdeps = get_option('staticdeps')
@ -38,21 +41,21 @@ git = find_program('git', required: true)
init = custom_target(
'fake_init',
output: ['init.c'],
command: [python3, meson.source_root() + '/../../tools/tr2/generate_init', '-o', meson.current_build_dir() / '@OUTPUT0@'],
command: [python3, meson.project_source_root() + '/../../tools/tr2/generate_init', '-o', meson.current_build_dir() / '@OUTPUT0@'],
build_always_stale: true,
)
version_rc = custom_target(
'fake_version',
output: ['version.rc'],
command: [python3, meson.source_root() + '/../../tools/tr2/generate_rcfile', '-o', '@OUTPUT0@'],
command: [python3, meson.project_source_root() + '/../../tools/tr2/generate_rcfile', '-o', '@OUTPUT0@'],
build_always_stale: true,
)
icon_rc = custom_target(
'fake_icon',
output: ['icon.rc'],
command: [python3, meson.source_root() + '/../../tools/tr2/generate_rcfile', '-o', '@OUTPUT0@'],
command: [python3, meson.project_source_root() + '/../../tools/tr2/generate_rcfile', '-o', '@OUTPUT0@'],
)
link_args = []
@ -301,5 +304,5 @@ executable(
name_prefix: '',
link_args: link_args,
dependencies: dependencies,
gui_app: true,
win_subsystem: 'windows',
)

2
tools/tr1/docker/game-win/meson_linux_mingw32.txt
View file

@ -4,7 +4,7 @@ cpp = '/usr/bin/i686-w64-mingw32-g++'
objc = '/usr/bin/i686-w64-mingw32-gcc'
ar = '/usr/bin/i686-w64-mingw32-ar'
strip = '/usr/bin/i686-w64-mingw32-strip'
pkgconfig = '/usr/bin/i686-w64-mingw32-pkg-config'
pkg-config = '/usr/bin/i686-w64-mingw32-pkg-config'
windres = '/usr/bin/i686-w64-mingw32-windres'
exe_wrapper = 'wine'
ld = '/usr/bin/i686-w64-mingw32-ld'

2
tools/tr2/docker/game-win/meson_linux_mingw32.txt
View file

@ -4,7 +4,7 @@ cpp = '/usr/bin/i686-w64-mingw32-g++'
objc = '/usr/bin/i686-w64-mingw32-gcc'
ar = '/usr/bin/i686-w64-mingw32-ar'
strip = '/usr/bin/i686-w64-mingw32-strip'
pkgconfig = '/usr/bin/i686-w64-mingw32-pkg-config'
pkg-config = '/usr/bin/i686-w64-mingw32-pkg-config'
windres = '/usr/bin/i686-w64-mingw32-windres'
exe_wrapper = 'wine'
ld = '/usr/bin/i686-w64-mingw32-ld'