King_DuckZ/psp2name
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Build fix for isoinfo lib.

Browse source
This commit is contained in:
King_DuckZ 2020-03-03 13:58:26 +01:00
parent c2db22734b
commit 289444bb63
3 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
meson.build
View file

@ -10,7 +10,6 @@ d_compiler = meson.get_compiler('d')
#endif #endif
if d_compiler.get_id() == 'llvm' if d_compiler.get_id() == 'llvm'
add_project_arguments('-d-version=USE_SCG', language: 'd') add_project_arguments('-d-version=USE_SCG', language: 'd')
add_project_arguments('-DUSE_SCG', language: 'c')
endif endif
libisoinfo_proj = subproject('isoinfo') libisoinfo_proj = subproject('isoinfo')

21
subprojects/isoinfo/meson.build
View file

@ -1,6 +1,25 @@
project('isoinfo', 'c', project('isoinfo', 'c',
version: '3.0.2', version: '3.0.2',
default_options: ['c_std=c99'] default_options: ['c_std=c89']
)
#original link command:
#gcc -o OBJ/amd-ryzen-7-pro-2700u-w--radeon-vega-mobile-gfx-linux-cc/isoinfo OBJ/amd-ryzen-7-pro-2700u-w--radeon-vega-mobile-gfx-linux-cc/isoinfo.o OBJ/amd-ryzen-7-pro-2700u-w--radeon-vega-mobile-gfx-linux-cc/scsi.o -L../../libs/amd-ryzen-7-pro-2700u-w--radeon-vega-mobile-gfx-linux-cc -L../../libs/amd-ryzen-7-pro-2700u-w--radeon-vega-mobile-gfx-linux-cc -L/opt/schily/lib -Wl,-R/opt/schily/lib -Wl,-R/opt/schily/lib -lsiconv -lscgcmd -lrscg -lscg -lcdrdeflt -ldeflt -lfind -lschily -lacl -lcap
#original compile command:
#gcc -O -DSCHILY_BUILD -IOBJ/amd-ryzen-7-pro-2700u-w--radeon-vega-mobile-gfx-linux-cc -I../../incs/amd-ryzen-7-pro-2700u-w--radeon-vega-mobile-gfx-linux-cc -I../../include -DUSE_LIBSCHILY -DUSE_LARGEFILES -DUSE_SCG -I.. -I../../libscg -I../../libscgcmd -I../../libcdrdeflt -DUSE_FIND -DSCHILY_PRINT -DUSE_NLS -DUSE_ICONV -DINS_BASE="/opt/schily" -DTEXT_DOMAIN="SCHILY_cdrtools" -D_GNU_SOURCE -c -o OBJ/amd-ryzen-7-pro-2700u-w--radeon-vega-mobile-gfx-linux-cc/isoinfo.o isoinfo.c
add_project_arguments(
'-DUSE_SCG',
'-DUSE_FIND',
'-DUSE_ICONV',
'-DUSE_LIBSCHILY',
'-DUSE_LARGEFILES',
'-DSCHILY_PRINT',
'-DUSER_NLS',
'-DINS_BASE="/opt/schily"',
'-DTEXT_DOMAIN="SCHILY_cdrtools"',
language: 'c'
) )
c_compiler = meson.get_compiler('c') c_compiler = meson.get_compiler('c')

11
subprojects/isoinfo/src/isoinfo.c
View file

@ -59,11 +59,12 @@ static UConst char sccsid[] =
#include <schily/errno.h> #include <schily/errno.h>
#include <schily/schily.h> #include <schily/schily.h>
#include "../iso9660.h" #include "iso9660.h"
#include "../rock.h" #include "rock.h"
#include "../scsi.h" #include "scsi.h"
#include "cdrdeflt.h" #include "cdrdeflt/cdrdeflt.h"
#include "../../cdrecord/version.h"
#define VERSION "3.02a09"
#include <schily/siconv.h> #include <schily/siconv.h>
#include <schily/io.h> /* for setmode() prototype */ #include <schily/io.h> /* for setmode() prototype */