Use nitrogfx's own meson.build instead of patch_directory

This commit is contained in:
Nomura
2023-08-02 12:13:17 +02:00
committed by mid-kid
parent c555fa86dd
commit aae349f4f5
4 changed files with 5 additions and 24 deletions

View File

@@ -69,4 +69,4 @@ elif is_wsl_accessing_windows; then
fi
# Launch meson
"${MESON:-meson}" setup --native-file=meson/"$native_file" --native-file="$build/root.ini" --cross-file=meson/"$cross_file" --cross-file="$build/root.ini" "$@" -- "$build"
"${MESON:-meson}" setup -Dnitrogfx:native=true --native-file=meson/"$native_file" --native-file="$build/root.ini" --cross-file=meson/"$cross_file" --cross-file="$build/root.ini" "$@" -- "$build"

View File

@@ -2,4 +2,6 @@
url = https://github.com/red031000/nitrogfx.git
revision = head
depth = 1
patch_directory = nitrogfx_patch
[provide]
program_names = nitrogfx

View File

@@ -1,21 +0,0 @@
project('nitrogfx', 'c')
libpng_dep = dependency('libpng', native: true)
nitrogfx_exe = executable('nitrogfx',
sources: [
'main.c',
'convert_png.c',
'gfx.c',
'jasc_pal.c',
'lz.c',
'rl.c',
'util.c',
'font.c',
'huff.c',
'json.c',
'cJSON.c',
],
dependencies: libpng_dep,
native: true
)

View File

@@ -11,4 +11,4 @@ makelcf_exe = find_program('makelcf', native: true)
makerom_exe = find_program('makerom', native: true)
# External tools
nitrogfx_exe = subproject('nitrogfx').get_variable('nitrogfx_exe')
nitrogfx_exe = find_program('nitrogfx', native: true)