diff --git a/meson.build b/meson.build index d10efdb..7a03c2d 100644 --- a/meson.build +++ b/meson.build @@ -10,7 +10,6 @@ d_compiler = meson.get_compiler('d') #endif if d_compiler.get_id() == 'llvm' add_project_arguments('-d-version=USE_SCG', language: 'd') - add_project_arguments('-DUSE_SCG', language: 'c') endif libisoinfo_proj = subproject('isoinfo') diff --git a/subprojects/isoinfo/meson.build b/subprojects/isoinfo/meson.build index 1aef0ec..483e93c 100644 --- a/subprojects/isoinfo/meson.build +++ b/subprojects/isoinfo/meson.build @@ -1,6 +1,25 @@ project('isoinfo', 'c', 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') diff --git a/subprojects/isoinfo/src/isoinfo.c b/subprojects/isoinfo/src/isoinfo.c index 9df339b..ab1edf7 100644 --- a/subprojects/isoinfo/src/isoinfo.c +++ b/subprojects/isoinfo/src/isoinfo.c @@ -59,11 +59,12 @@ static UConst char sccsid[] = #include #include -#include "../iso9660.h" -#include "../rock.h" -#include "../scsi.h" -#include "cdrdeflt.h" -#include "../../cdrecord/version.h" +#include "iso9660.h" +#include "rock.h" +#include "scsi.h" +#include "cdrdeflt/cdrdeflt.h" + +#define VERSION "3.02a09" #include #include /* for setmode() prototype */