tretrauit/jadeite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Internal rework to avoid a possible edge case

Browse Source
This commit is contained in:
mkrsym1 2023-07-08 21:17:28 +03:00
parent 7f43a042e8
commit 2ebd40b621
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
game_payload/blob/tp6c.o
View File

Binary file not shown.

11
game_payload/meson.build
View File

@ -51,7 +51,7 @@ if fs.exists('src/tp6.c')
# another dirty hack # another dirty hack
copy_tp6c = find_program('copy_tp6c.sh') copy_tp6c = find_program('copy_tp6c.sh')
tp6c = custom_target( tp6c_target = [custom_target(
'copy_tp6c', 'copy_tp6c',
output: 'tp6c.o', output: 'tp6c.o',
input: tp6c_fake_exe.extract_all_objects(recursive: false), input: tp6c_fake_exe.extract_all_objects(recursive: false),
@ -60,10 +60,12 @@ if fs.exists('src/tp6.c')
'@INPUT0@', '@INPUT0@',
'@OUTPUT0@', meson.current_source_dir() / 'blob/tp6c.o' '@OUTPUT0@', meson.current_source_dir() / 'blob/tp6c.o'
] ]
) )]
tp6c_blob = []
else else
message('Using precompiled tp6c blob. Refer to the readme for more details') message('Using precompiled tp6c blob. Refer to the readme for more details')
tp6c = 'blob/tp6c.o' tp6c_target = []
tp6c_blob = [ 'blob/tp6c.o' ]
endif endif
shared_library( shared_library(
@ -71,7 +73,8 @@ shared_library(
sources, sources,
res_header, res_header,
res_object, res_object,
objects: tp6c, tp6c_target,
objects: tp6c_blob,
include_directories: include_dir, include_directories: include_dir,
name_prefix: '' name_prefix: ''
) )