From 44d0ef2caa3fb5339149eee57be13170e6c9560e Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Wed, 28 Dec 2011 15:55:13 +0000 Subject: [PATCH] Integrated new source file libburn/cdtext.c --- xorriso/compile_xorriso.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/xorriso/compile_xorriso.sh b/xorriso/compile_xorriso.sh index d7a1e220..fc9013af 100755 --- a/xorriso/compile_xorriso.sh +++ b/xorriso/compile_xorriso.sh @@ -22,11 +22,15 @@ def_opts="-DXorriso_allow_external_filterS" largefile_opts="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1" do_strip=0 static_opts= -warn_opts="-Wall" +warn_opts="-Wall -Wextra -Wno-unused-parameter" +# warn_opts="-Wall -Wsign-compare" nglibisofs=1 +def_have="-DHAVE_STDINT_H" def_libreadline="-DXorriso_with_readlinE" +def_libjte="-DXorriso_with_libjtE -DLibisofs_with_libjtE" link_libreadline="-lreadline" link_libcdio= +link_libjte="-ljte" for i in "$@" do @@ -50,6 +54,10 @@ do elif test "$i" = "-use_libcdio" then link_libcdio="-lcdio" + elif test "$i" = "-no_libjte" + then + def_libjte="" + link_libjte="" elif test "$i" = "-help" -o "$i" = "--help" -o "$i" = "-h" then echo \ @@ -58,6 +66,7 @@ do echo " -dvd_obs_64k 64 KB default size for DVD/BD writing." echo " -no_libreadline do not compile for and link with libreadline." echo " -use_libcdio link with -lcdio because libburn uses it." + echo " -no_libjte do not compile for and link with libjte." echo " -do_diet produce capability reduced lean version." echo " -do_strip apply program strip to compiled programs." echo " -g produce debuggable programm." @@ -108,7 +117,7 @@ date -u '+#define Xorriso_build_timestamP "%Y.%m.%d.%H%M%S"' >"$xorr"/xorriso_bu echo "Build timestamp : $(sed -e 's/#define Xorriso_build_timestamP "//' -e 's/"$//' "$xorr"/xorriso_buildstamp.h)" echo "compiling program $xorr/xorriso.c $static_opts $debug_opts $def_opts $link_libcdio" -cc -I. -DXorriso_with_maiN $def_libreadline \ +cc -I. -DXorriso_with_maiN $def_have $def_libreadline $def_libjte \ $warn_opts \ $static_opts \ $debug_opts \ @@ -165,6 +174,7 @@ cc -I. -DXorriso_with_maiN $def_libreadline \ "$burn"/libdax_audioxtr.o \ "$burn"/libdax_msgs.o \ "$burn"/cleanup.o \ + "$burn"/cdtext.o \ \ "$burn"/mmc.o \ "$burn"/sbc.o \ @@ -181,6 +191,7 @@ cc -I. -DXorriso_with_maiN $def_libreadline \ \ $link_libreadline \ $link_libcdio \ + $link_libjte \ \ -lpthread \ -lacl \