Attachment #1010 for bug #7412

View | Details | Raw Unified | Return to bug 7412
Collapse All | Expand All




CPPOPTS +=	-DDVD_VIDEO
CPPOPTS +=	-DSORTING
CPPOPTS +=	-I../libhfs_iso/
CPPOPTS	+=	-DHAVE_CONFIG_H -DUSE_LIBSCHILY -DUSE_SCG -DHAVE_NATSPEC \
		'-DAPPID_DEFAULT="MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING"' \
		-I../cdrecord
CFILES=		mkisofs.c tree.c write.c hash.c rock.c udf.c multi.c \

		ifo_read.h dvd_file.h dvd_reader.h bswap.h ifo_types.h \
		../cdrecord/defaults.h

LIBS=		-lhfs -lfile -lunls -lrscg -lscg $(LIB_VOLMGT) -ldeflt -lschily $(SCSILIB) $(LIB_SOCKET) -lnatspec
XMK_FILE=	Makefile.man hybridman.mk

--- /home/lav/work/build/BUILD/cdrtools-2.01/mkisofs/diag/isoinfo.mk	2004-06-01 14:50:59 +0400

CPPOPTS +=	-DUSE_LARGEFILES
CPPOPTS +=	-DUSE_SCG
CPPOPTS +=	-I..
CPPOPTS +=	-I../../cdrecord -DHAVE_NATSPEC
CFILES=		isoinfo.c \
		scsi.c scsi_cdr.c cd_misc.c modes.c \
		defaults.c getnum.c
LIBS=		-lunls -lrscg -lscg $(LIB_VOLMGT) -ldeflt -lschily $(SCSILIB) $(LIB_SOCKET) -lnatspec
XMK_FILE=	Makefile.man

###########################################################################
###########################################################################

Lines 43-48 Link Here

(-)/home/lav/work/build/BUILD/cdrtools-2.01/mkisofs/mkisofs.c (+8 lines)
43	#include "udf.h"	43	#include "udf.h"
44	#endif	44	#endif
45		45
		46	#ifdef HAVE_NATSPEC
		47	#include <natspec.h>
		48	#endif
		49
46	#ifdef NEED_O_BINARY	50	#ifdef NEED_O_BINARY
47	#include <io.h> /* for setmode() prototype */	51	#include <io.h> /* for setmode() prototype */
48	#endif	52	#endif
Lines 2338-2345 Link Here
2338	#if (defined(__CYGWIN32__) \|\| defined(__CYGWIN__) \|\| defined(__DJGPP__)) && !defined(IS_CYGWIN_1)	2342	#if (defined(__CYGWIN32__) \|\| defined(__CYGWIN__) \|\| defined(__DJGPP__)) && !defined(IS_CYGWIN_1)
2339	in_nls = load_nls("cp437");	2343	in_nls = load_nls("cp437");
2340	#else	2344	#else
		2345	#ifdef HAVE_NATSPEC
		2346	in_nls = load_nls(natspec_get_filename_encoding(""));
		2347	#else
2341	in_nls = load_nls("iso8859-1");	2348	in_nls = load_nls("iso8859-1");
2342	#endif	2349	#endif
		2350	#endif
2343	} else {	2351	} else {
2344	if (strcmp(icharset, "default") == 0)	2352	if (strcmp(icharset, "default") == 0)
2345	in_nls = load_nls_default();	2353	in_nls = load_nls_default();

Lines 57-62 Link Here

(-)/home/lav/work/build/BUILD/cdrtools-2.01/mkisofs/diag/isoinfo.c (+8 lines)
57	#include "../scsi.h"	57	#include "../scsi.h"
58	#include "../../cdrecord/defaults.h"	58	#include "../../cdrecord/defaults.h"
59		59
		60	#ifdef HAVE_NATSPEC
		61	#include <natspec.h>
		62	#endif
		63
60	#include <unls.h>	64	#include <unls.h>
61		65
62	#if defined(__CYGWIN32__) \|\| defined(__EMX__) \|\| defined(__DJGPP__)	66	#if defined(__CYGWIN32__) \|\| defined(__EMX__) \|\| defined(__DJGPP__)
Lines 895-901 Link Here
895	#if (defined(__CYGWIN32__) \|\| defined(__CYGWIN__) \|\| defined(__DJGPP__)) && !defined(IS_CYGWIN_1)	899	#if (defined(__CYGWIN32__) \|\| defined(__CYGWIN__) \|\| defined(__DJGPP__)) && !defined(IS_CYGWIN_1)
896	nls = load_nls("cp437");	900	nls = load_nls("cp437");
897	#else	901	#else
		902	#ifdef HAVE_NATSPEC
		903	nls = load_nls(natspec_get_filename_encoding(""));
		904	#else
898	nls = load_nls("iso8859-1");	905	nls = load_nls("iso8859-1");
		906	#endif
899	#endif	907	#endif
900	} else {	908	} else {
901	if (strcmp(charset, "default") == 0)	909	if (strcmp(charset, "default") == 0)

Lines 113-118 Link Here

(-)nls_base.c.o (+2 lines)
113	int ret;	113	int ret;
114	#endif	114	#endif
115		115
		116	if (!strcmp(charset,"utf8"))
		117	charset = "iso8859-1";
116	nls = find_nls(charset);	118	nls = find_nls(charset);
117	if (nls) {	119	if (nls) {
118	nls->inc_use_count();	120	nls->inc_use_count();

Return to bug 7412

Lines 33-39 Link Here

(-)/home/lav/work/build/BUILD/cdrtools-2.01/mkisofs/Makefile (-4 / +4 lines)
33	CPPOPTS += -DDVD_VIDEO	33	CPPOPTS += -DDVD_VIDEO
34	CPPOPTS += -DSORTING	34	CPPOPTS += -DSORTING
35	CPPOPTS += -I../libhfs_iso/	35	CPPOPTS += -I../libhfs_iso/
36	CPPOPTS += -DHAVE_CONFIG_H -DUSE_LIBSCHILY -DUSE_SCG \	36	CPPOPTS += -DHAVE_CONFIG_H -DUSE_LIBSCHILY -DUSE_SCG -DHAVE_NATSPEC \
37	'-DAPPID_DEFAULT="MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING"' \	37	'-DAPPID_DEFAULT="MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING"' \
38	-I../cdrecord	38	-I../cdrecord
39	CFILES= mkisofs.c tree.c write.c hash.c rock.c udf.c multi.c \	39	CFILES= mkisofs.c tree.c write.c hash.c rock.c udf.c multi.c \
Lines 51-57 Link Here
51	ifo_read.h dvd_file.h dvd_reader.h bswap.h ifo_types.h \	51	ifo_read.h dvd_file.h dvd_reader.h bswap.h ifo_types.h \
52	../cdrecord/defaults.h	52	../cdrecord/defaults.h
53		53
54	LIBS= -lhfs -lfile -lunls -lrscg -lscg $(LIB_VOLMGT) -ldeflt -lschily $(SCSILIB) $(LIB_SOCKET)	54	LIBS= -lhfs -lfile -lunls -lrscg -lscg $(LIB_VOLMGT) -ldeflt -lschily $(SCSILIB) $(LIB_SOCKET) -lnatspec
55	XMK_FILE= Makefile.man hybridman.mk	55	XMK_FILE= Makefile.man hybridman.mk
56		56
57	--- /home/lav/work/build/BUILD/cdrtools-2.01/mkisofs/diag/isoinfo.mk 2004-06-01 14:50:59 +0400	57	--- /home/lav/work/build/BUILD/cdrtools-2.01/mkisofs/diag/isoinfo.mk 2004-06-01 14:50:59 +0400
Lines 25-35 Link Here
25	CPPOPTS += -DUSE_LARGEFILES	25	CPPOPTS += -DUSE_LARGEFILES
26	CPPOPTS += -DUSE_SCG	26	CPPOPTS += -DUSE_SCG
27	CPPOPTS += -I..	27	CPPOPTS += -I..
28	CPPOPTS += -I../../cdrecord	28	CPPOPTS += -I../../cdrecord -DHAVE_NATSPEC
29	CFILES= isoinfo.c \	29	CFILES= isoinfo.c \
30	scsi.c scsi_cdr.c cd_misc.c modes.c \	30	scsi.c scsi_cdr.c cd_misc.c modes.c \
31	defaults.c getnum.c	31	defaults.c getnum.c
32	LIBS= -lunls -lrscg -lscg $(LIB_VOLMGT) -ldeflt -lschily $(SCSILIB) $(LIB_SOCKET)	32	LIBS= -lunls -lrscg -lscg $(LIB_VOLMGT) -ldeflt -lschily $(SCSILIB) $(LIB_SOCKET) -lnatspec
33	XMK_FILE= Makefile.man	33	XMK_FILE= Makefile.man
34		34
35	###########################################################################	35	###########################################################################
36	###########################################################################	36	###########################################################################