mirror of
https://github.com/The-Powder-Toy/The-Powder-Toy.git
synced 2025-08-03 06:57:31 +02:00
Fix assumption that python is called python
The assumption was introduced by 7e674a887d
, where find_program('python') was used instead of Meson's built-in python discovery services. This turned out to be a bad idea because of course there are systems in 2024 where python is not python 3.
This commit is contained in:
@@ -15,9 +15,12 @@ if get_option('prepare')
|
||||
subdir_done()
|
||||
endif
|
||||
|
||||
python = import('python')
|
||||
python3_prog = python.find_installation('python3')
|
||||
|
||||
fs = import('fs')
|
||||
to_array = generator(
|
||||
find_program('python'),
|
||||
python3_prog,
|
||||
output: [ '@PLAINNAME@.cpp', '@PLAINNAME@.h' ],
|
||||
arguments: [ join_paths(meson.current_source_dir(), 'resources/to-array.py'), '@OUTPUT0@', '@OUTPUT1@', '@INPUT@', '@EXTRA_ARGS@' ]
|
||||
)
|
||||
|
@@ -49,7 +49,7 @@ if host_platform == 'windows'
|
||||
}
|
||||
foreach key, icons : win_icos
|
||||
command = [
|
||||
find_program('python'),
|
||||
python3_prog,
|
||||
join_paths(meson.current_source_dir(), 'make-ico.py'),
|
||||
'@OUTPUT@',
|
||||
]
|
||||
|
Reference in New Issue
Block a user