diff --git a/configure b/configure index bdc56e60..aaaf98cf 100644 --- a/configure +++ b/configure @@ -3463,6 +3463,10 @@ $as_echo "#define _GNU_SOURCE /**/" >>confdefs.h # AC_MSG_ERROR([unsupported development environment]) #esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: enabling support for large files (_FILE_OFFSET_BITS=64)" >&5 +$as_echo "enabling support for large files (_FILE_OFFSET_BITS=64)" >&6; } +AM_CFLAGS="-D_FILE_OFFSET_BITS=64 -D_OFF_T_DEFINED -D_OFF_T_ -D_off_t=off64_t -Doff_t=off64_t" + # Clang needs an explicit WIN32_WINNT defined else it produces warnings # in msapi_utf8.h - including winver.h only doesn't work AM_CFLAGS="${AM_CFLAGS} -DWINVER=0x501 -D_WIN32_IE=0x501 -D_WIN32_WINNT=0x501" diff --git a/configure.ac b/configure.ac index f177a2b4..82ca252d 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,9 @@ AC_DEFINE([_GNU_SOURCE], [], [Use GNU extensions]) # AC_MSG_ERROR([unsupported development environment]) #esac +AC_MSG_RESULT([enabling support for large files (_FILE_OFFSET_BITS=64)]) +AM_CFLAGS="-D_FILE_OFFSET_BITS=64 -D_OFF_T_DEFINED -D_OFF_T_ -D_off_t=off64_t -Doff_t=off64_t" + # Clang needs an explicit WIN32_WINNT defined else it produces warnings # in msapi_utf8.h - including winver.h only doesn't work AM_CFLAGS="${AM_CFLAGS} -DWINVER=0x501 -D_WIN32_IE=0x501 -D_WIN32_WINNT=0x501" diff --git a/src/.msvc/iso.vcxproj b/src/.msvc/iso.vcxproj index 000156e4..1a030023 100644 --- a/src/.msvc/iso.vcxproj +++ b/src/.msvc/iso.vcxproj @@ -77,7 +77,7 @@ - ISO_TEST;_CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;ISOLATION_AWARE_ENABLED;%(PreprocessorDefinitions) + ISO_TEST;_CRTDBG_MAP_ALLOC;HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) MultiThreadedDebug Level3 ..\msvc-missing;..\libcdio;%(AdditionalIncludeDirectories) @@ -100,7 +100,7 @@ ..\msvc-missing;..\libcdio;%(AdditionalIncludeDirectories) - ISO_TEST;_CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;ISOLATION_AWARE_ENABLED;%(PreprocessorDefinitions) + ISO_TEST;_CRTDBG_MAP_ALLOC;HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) MultiThreadedDebug Level3 ProgramDatabase @@ -119,7 +119,7 @@ - ISO_TEST;_CRT_SECURE_NO_WARNINGS;ISOLATION_AWARE_ENABLED;%(PreprocessorDefinitions) + ISO_TEST;HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) MultiThreaded Level3 ..\msvc-missing;..\libcdio;%(AdditionalIncludeDirectories) @@ -141,7 +141,7 @@ X64 - ISO_TEST;_CRT_SECURE_NO_WARNINGS;ISOLATION_AWARE_ENABLED;%(PreprocessorDefinitions) + ISO_TEST;HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) MultiThreaded Level3 ..\msvc-missing;..\libcdio;%(AdditionalIncludeDirectories) diff --git a/src/libcdio/cdio/iso9660.h b/src/libcdio/cdio/iso9660.h index effe7110..99abd7c2 100644 --- a/src/libcdio/cdio/iso9660.h +++ b/src/libcdio/cdio/iso9660.h @@ -986,7 +986,7 @@ uint8_t iso9660_ifs_get_joliet_level(iso9660_t *p_iso); uint8_t iso9660_get_dir_len(const iso9660_dir_t *p_idr); -#if FIXME +#ifdef FIXME uint8_t iso9660_get_dir_size(const iso9660_dir_t *p_idr); lsn_t iso9660_get_dir_extent(const iso9660_dir_t *p_idr); diff --git a/src/libcdio/config.h b/src/libcdio/config.h index 5cae6a55..a23bd625 100644 --- a/src/libcdio/config.h +++ b/src/libcdio/config.h @@ -1,105 +1,52 @@ -/* config.h. Manually edited for MSVC compilers. */ +/* config.h for libcdio (used by both MinGW and MSVC) */ +#if defined(_MSC_VER) /* Disable: warning C4996: The POSIX name for this item is deprecated. */ #pragma warning(disable:4996) /* Disable: warning C4018: signed/unsigned mismatch */ #pragma warning(disable:4018) - -/* Define if building universal (internal helper macro) */ -/* #undef AC_APPLE_UNIVERSAL_BUILD */ - -/* Define 1 if you are compiling using cygwin */ -/* #undef CYGWIN */ +/* Disable: warning C4242: conversion from 'x' to 'y', possible loss of data */ +#pragma warning(disable:4242) /* 32 bit */ +#pragma warning(disable:4244) /* 64 bit */ +#endif /* what to put between the brackets for empty arrays */ -#define EMPTY_ARRAY_SIZE 0 - -/* Define 1 if you have BSDI-type CD-ROM support */ -/* #undef HAVE_BSDI_CDROM */ - -/* Define this if you have libcddb installed */ -/* #undef HAVE_CDDB */ +#define EMPTY_ARRAY_SIZE /* Define to 1 if you have the `chdir' function. */ /* #undef HAVE_CHDIR */ -/* Define to 1 if you have the header file. */ -/* #undef HAVE_COREFOUNDATION_CFBASE_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_CURSES_H */ - -/* Define 1 if you have Darwin OS X-type CD-ROM support */ -/* #undef HAVE_DARWIN_CDROM */ - /* Define if time.h defines extern long timezone and int daylight vars. */ #define HAVE_DAYLIGHT 1 -/* Define to 1 if you have the Apple DiskArbitration framework */ -/* #undef HAVE_DISKARBITRATION */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_DLFCN_H */ - /* Define to 1 if you have the `drand48' function. */ /* #undef HAVE_DRAND48 */ -/* Define to 1 if you have the header file. */ -/* #undef HAVE_DVD_H */ - /* Define to 1 if you have the header file. */ #define HAVE_ERRNO_H 1 /* Define to 1 if you have the header file. */ #define HAVE_FCNTL_H 1 -/* Define 1 if you have FreeBSD CD-ROM support */ -/* #undef HAVE_FREEBSD_CDROM */ - /* Define to 1 if you have the `fseeko' function. */ /* #undef HAVE_FSEEKO */ /* Define to 1 if you have the `fseeko64' function. */ #define HAVE_FSEEKO64 1 /* The equivalent of fseeko64 for MSVC is _fseeki64 */ +#if defined(_MSC_VER) #define fseeko64 _fseeki64 +#endif /* Define to 1 if you have the `ftruncate' function. */ /* #undef HAVE_FTRUNCATE */ -/* Define to 1 if you have the `geteuid' function. */ -/* #undef HAVE_GETEUID */ - -/* Define to 1 if you have the `getgid' function. */ -/* #undef HAVE_GETGID */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_GETOPT_H */ - -/* Define to 1 if you have the `getpwuid' function. */ -/* #undef HAVE_GETPWUID */ - -/* Define to 1 if you have the `gettimeofday' function. */ -/* #undef HAVE_GETTIMEOFDAY */ - -/* Define to 1 if you have the `getuid' function. */ -/* #undef HAVE_GETUID */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_GLOB_H */ - -/* Define to 1 if you have the `gmtime_r' function. */ -/* #undef HAVE_GMTIME_R */ - /* Define if you have the iconv() function and it works. */ /* #undef HAVE_ICONV */ /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1 /* provided in MSVC/missing if needed */ -/* Define to 1 if you have the header file. */ -/* #undef HAVE_IOKIT_IOKITLIB_H */ - /* Supports ISO _Pragma() macro */ /* #undef HAVE_ISOC99_PRAGMA */ @@ -107,39 +54,9 @@ libiconv installed to get Joliet extension support. */ #define HAVE_JOLIET 1 -/* Define this if your libcurses has keypad */ -/* #undef HAVE_KEYPAD */ - -/* Define if you have and nl_langinfo(CODESET). */ -/* #undef HAVE_LANGINFO_CODESET */ - -/* Define to 1 if you have the `nsl' library (-lnsl). */ -/* #undef HAVE_LIBNSL */ - -/* Define to 1 if you have the `socket' library (-lsocket). */ -/* #undef HAVE_LIBSOCKET */ - /* Define to 1 if you have the header file. */ #define HAVE_LIMITS_H 1 -/* Define 1 if you have Linux-type CD-ROM support */ -/* #undef HAVE_LINUX_CDROM */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_LINUX_CDROM_H */ - -/* Define 1 if timeout is in cdrom_generic_command struct */ -/* #undef HAVE_LINUX_CDROM_TIMEOUT */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_LINUX_MAJOR_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_LINUX_VERSION_H */ - -/* Define to 1 if you have the `localtime_r' function. */ -/* #undef HAVE_LOCALTIME_R */ - /* Define to 1 if you have the `lseek64' function. */ #define HAVE_LSEEK64 1 /* The equivalent of lseek64 on MSVC is _lseeki64 */ @@ -157,21 +74,6 @@ /* Define to 1 if you have the `memset' function. */ #define HAVE_MEMSET 1 -/* Define to 1 if you have the header file. */ -/* #undef HAVE_NCURSES_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_NCURSES_NCURSES_H */ - -/* Define 1 if you have NetBSD CD-ROM support */ -/* #undef HAVE_NETBSD_CDROM */ - -/* Define 1 if you have OS/2 CD-ROM support */ -/* #undef HAVE_OS2_CDROM */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_PWD_H */ - /* Define to 1 if you have the `rand' function. */ #define HAVE_RAND 1 @@ -201,9 +103,6 @@ /* The equivalent of snprintf on MSVC is _snprintf */ #define snprintf _snprintf -/* Define 1 if you have Solaris CD-ROM support */ -/* #undef HAVE_SOLARIS_CDROM */ - /* Define to 1 if you have the header file. */ #define HAVE_STDARG_H 1 @@ -219,6 +118,11 @@ /* Define to 1 if you have the header file. */ #define HAVE_STDLIB_H 1 +/* Define to 1 if you have the `strdup' function. */ +#define HAVE_STRDUP 1 +/* The equivalent of strdup on MSVC is _strdup */ +#define strdup _strdup + /* Define to 1 if you have the header file. */ /* #undef HAVE_STRINGS_H */ @@ -240,27 +144,18 @@ /* Define to 1 if you have the header file. */ #define HAVE_SYS_STAT_H 1 -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_TIMEB_H */ - /* Define to 1 if you have the header file. */ #define HAVE_SYS_TIME_H 1 /* Define to 1 if you have the header file. */ #define HAVE_SYS_TYPES_H 1 -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_UTSNAME_H */ - /* Define this defines S_ISLNK() */ /* #undef HAVE_S_ISLNK */ /* Define this defines S_ISSOCK() */ /* #undef HAVE_S_ISSOCK */ -/* Define to 1 if timegm is available */ -/* #undef HAVE_TIMEGM */ - /* Define if you have an extern long timenzone variable. */ #define HAVE_TIMEZONE_VAR 1 @@ -269,6 +164,8 @@ /* Define if time.h defines extern extern char *tzname[2] variable */ #define HAVE_TZNAME 1 +/* The equivalent of tzset on MSVC is _tzset */ +#define tzset _tzset /* Define to 1 if you have the `tzset' function. */ #define HAVE_TZSET 1 @@ -282,9 +179,6 @@ /* Define to 1 if you have the `usleep' function. */ /* #undef HAVE_USLEEP */ -/* Define this if you have libvcdinfo installed */ -/* #undef #undef HAVE_VCDINFO */ - /* Define to 1 if you have the `vsnprintf' function. */ /* #undef HAVE_VSNPRINTF */ @@ -305,98 +199,13 @@ script can define this before including any of libcdio's headers. */ #define LIBCDIO_CONFIG_H 1 -/* Full path to libcdio top_sourcedir. */ -/* #undef LIBCDIO_SOURCE_PATH */ - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -/* #undef LT_OBJDIR */ - -/* Define 1 if you are compiling using MinGW */ -/* #undef MINGW32 */ - -/* Define 1 if you need timezone defined to get timzone defined as a variable. - In cygwin it is a function too */ -/* #undef NEED_TIMEZONEVAR */ - -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -/* #undef NO_MINUS_C_MINUS_O */ - -/* Name of package */ -#define PACKAGE "libcdio" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "libcdio-help@gnu.org" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "libcdio" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "libcdio 0.84git" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "libcdio" - -/* Define to the home page for this package. */ -#define PACKAGE_URL "" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "0.84git" - /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 -/* Enable extensions on AIX 3, Interix. */ -/* #undef _ALL_SOURCE */ - -/* Enable GNU extensions on systems that have them. */ -/* #undef _GNU_SOURCE */ - -/* Enable threading extensions on Solaris. */ -/* #undef _POSIX_PTHREAD_SEMANTICS */ - -/* Enable extensions on HP NonStop. */ -/* #undef _TANDEM_SOURCE */ - -/* Enable general extensions on Solaris. */ -/* #undef __EXTENSIONS__ */ - -/* Version number of package */ -#define VERSION "0.84git" - -/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most - significant byte first (like Motorola and SPARC, unlike Intel). */ -#if defined AC_APPLE_UNIVERSAL_BUILD -# if defined __BIG_ENDIAN__ -# define WORDS_BIGENDIAN 1 -# endif -#else -# ifndef WORDS_BIGENDIAN -/* # undef WORDS_BIGENDIAN */ -# endif -#endif - /* Number of bits in a file offset, on hosts where this is settable. */ /* Note: This is defined as a preprocessor macro in the project files */ -/* #define _FILE_OFFSET_BITS 64 */ - -/* Define for large files, on AIX-style hosts. */ -/* #undef _LARGE_FILES */ - -/* Define to 1 if on MINIX. */ -/* #undef _MINIX */ - -/* Define to 2 if the system does not provide POSIX.1 features except with - this defined. */ -/* #undef _POSIX_1_SOURCE */ - -/* Define to 1 if you need to in order for `stat' and other things to work. */ -/* #undef _POSIX_SOURCE */ - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ +#define _FILE_OFFSET_BITS 64 /* Define to `__inline__' or `__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ #define inline __inline - diff --git a/src/libcdio/driver/.msvc/driver_sources b/src/libcdio/driver/.msvc/driver_sources index 1e2dae09..1cd13f3d 100644 --- a/src/libcdio/driver/.msvc/driver_sources +++ b/src/libcdio/driver/.msvc/driver_sources @@ -2,7 +2,8 @@ TARGETNAME=driver TARGETTYPE=LIBRARY INCLUDES=$(DDK_INC_PATH);.;..;..\..\msvc-missing -C_DEFINES=$(C_DEFINES) /DDDKBUILD /DUNICODE /D_UNICODE /DISOLATION_AWARE_ENABLED +LIBCDIO_DEFINES = /DHAVE_CONFIG_H /D_OFF_T_DEFINED /D_off_t=__int64 /Doff_t=_off_t /D_FILE_OFFSET_BITS=64 +C_DEFINES=$(C_DEFINES) $(LIBCDIO_DEFINES) /DDDKBUILD /DUNICODE /D_UNICODE /DISOLATION_AWARE_ENABLED !IFNDEF MSC_WARNING_LEVEL MSC_WARNING_LEVEL=/W3 @@ -19,5 +20,6 @@ SOURCES=disc.c \ sector.c \ track.c \ util.c \ + utf8.c \ _cdio_stdio.c \ _cdio_stream.c \ No newline at end of file diff --git a/src/libcdio/driver/Makefile.am b/src/libcdio/driver/Makefile.am index 76ad4432..4c5ad28c 100644 --- a/src/libcdio/driver/Makefile.am +++ b/src/libcdio/driver/Makefile.am @@ -1,3 +1,3 @@ noinst_LIBRARIES = libdriver.a -libdriver_a_SOURCES = disc.c ds.c logging.c read.c sector.c track.c util.c _cdio_stdio.c _cdio_stream.c -libdriver_a_CFLAGS = -I. -I.. $(AM_CFLAGS) +libdriver_a_SOURCES = disc.c ds.c logging.c read.c sector.c track.c util.c _cdio_stdio.c _cdio_stream.c utf8.c +libdriver_a_CFLAGS = -DHAVE_CONFIG_H -I. -I.. $(AM_CFLAGS) diff --git a/src/libcdio/driver/Makefile.in b/src/libcdio/driver/Makefile.in index 26ad68c7..f56c11cc 100644 --- a/src/libcdio/driver/Makefile.in +++ b/src/libcdio/driver/Makefile.in @@ -57,7 +57,7 @@ am_libdriver_a_OBJECTS = libdriver_a-disc.$(OBJEXT) \ libdriver_a-read.$(OBJEXT) libdriver_a-sector.$(OBJEXT) \ libdriver_a-track.$(OBJEXT) libdriver_a-util.$(OBJEXT) \ libdriver_a-_cdio_stdio.$(OBJEXT) \ - libdriver_a-_cdio_stream.$(OBJEXT) + libdriver_a-_cdio_stream.$(OBJEXT) libdriver_a-utf8.$(OBJEXT) libdriver_a_OBJECTS = $(am_libdriver_a_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = @@ -170,8 +170,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LIBRARIES = libdriver.a -libdriver_a_SOURCES = disc.c ds.c logging.c read.c sector.c track.c util.c _cdio_stdio.c _cdio_stream.c -libdriver_a_CFLAGS = -I. -I.. $(AM_CFLAGS) +libdriver_a_SOURCES = disc.c ds.c logging.c read.c sector.c track.c util.c _cdio_stdio.c _cdio_stream.c utf8.c +libdriver_a_CFLAGS = -DHAVE_CONFIG_H -I. -I.. $(AM_CFLAGS) all: all-am .SUFFIXES: @@ -300,6 +300,14 @@ libdriver_a-_cdio_stream.obj: _cdio_stream.c $(AM_V_CC) @AM_BACKSLASH@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdriver_a_CFLAGS) $(CFLAGS) -c -o libdriver_a-_cdio_stream.obj `if test -f '_cdio_stream.c'; then $(CYGPATH_W) '_cdio_stream.c'; else $(CYGPATH_W) '$(srcdir)/_cdio_stream.c'; fi` +libdriver_a-utf8.o: utf8.c + $(AM_V_CC) @AM_BACKSLASH@ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdriver_a_CFLAGS) $(CFLAGS) -c -o libdriver_a-utf8.o `test -f 'utf8.c' || echo '$(srcdir)/'`utf8.c + +libdriver_a-utf8.obj: utf8.c + $(AM_V_CC) @AM_BACKSLASH@ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdriver_a_CFLAGS) $(CFLAGS) -c -o libdriver_a-utf8.obj `if test -f 'utf8.c'; then $(CYGPATH_W) 'utf8.c'; else $(CYGPATH_W) '$(srcdir)/utf8.c'; fi` + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ diff --git a/src/libcdio/iso9660/.msvc/iso9660_sources b/src/libcdio/iso9660/.msvc/iso9660_sources index 893f6204..d78b3f1d 100644 --- a/src/libcdio/iso9660/.msvc/iso9660_sources +++ b/src/libcdio/iso9660/.msvc/iso9660_sources @@ -2,7 +2,8 @@ TARGETNAME=iso9660 TARGETTYPE=LIBRARY INCLUDES=$(DDK_INC_PATH);.;..;..\driver;..\..\msvc-missing -C_DEFINES=$(C_DEFINES) /DDDKBUILD /DUNICODE /D_UNICODE /DISOLATION_AWARE_ENABLED +LIBCDIO_DEFINES = /DHAVE_CONFIG_H /D_OFF_T_DEFINED /D_off_t=__int64 /Doff_t=_off_t /D_FILE_OFFSET_BITS=64 +C_DEFINES=$(C_DEFINES) $(LIBCDIO_DEFINES) /DDDKBUILD /DUNICODE /D_UNICODE /DISOLATION_AWARE_ENABLED !IFNDEF MSC_WARNING_LEVEL MSC_WARNING_LEVEL=/W3 @@ -15,5 +16,4 @@ TARGETLIBS=$(SDK_LIB_PATH)\kernel32.lib \ SOURCES=iso9660.c \ iso9660_fs.c \ rock.c \ - utf8.c \ xa.c \ No newline at end of file diff --git a/src/libcdio/iso9660/Makefile.am b/src/libcdio/iso9660/Makefile.am index a177260d..862ce3f5 100644 --- a/src/libcdio/iso9660/Makefile.am +++ b/src/libcdio/iso9660/Makefile.am @@ -1,3 +1,3 @@ noinst_LIBRARIES = libiso9660.a -libiso9660_a_SOURCES = iso9660.c iso9660_fs.c rock.c xa.c utf8.c -libiso9660_a_CFLAGS = -I. -I.. -I../driver $(AM_CFLAGS) +libiso9660_a_SOURCES = iso9660.c iso9660_fs.c rock.c xa.c +libiso9660_a_CFLAGS = -DHAVE_CONFIG_H -I. -I.. -I../driver $(AM_CFLAGS) diff --git a/src/libcdio/iso9660/Makefile.in b/src/libcdio/iso9660/Makefile.in index 36820810..123f0d77 100644 --- a/src/libcdio/iso9660/Makefile.in +++ b/src/libcdio/iso9660/Makefile.in @@ -54,7 +54,7 @@ libiso9660_a_AR = $(AR) $(ARFLAGS) libiso9660_a_LIBADD = am_libiso9660_a_OBJECTS = libiso9660_a-iso9660.$(OBJEXT) \ libiso9660_a-iso9660_fs.$(OBJEXT) libiso9660_a-rock.$(OBJEXT) \ - libiso9660_a-xa.$(OBJEXT) libiso9660_a-utf8.$(OBJEXT) + libiso9660_a-xa.$(OBJEXT) libiso9660_a_OBJECTS = $(am_libiso9660_a_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = @@ -167,8 +167,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LIBRARIES = libiso9660.a -libiso9660_a_SOURCES = iso9660.c iso9660_fs.c rock.c xa.c utf8.c -libiso9660_a_CFLAGS = -I. -I.. -I../driver $(AM_CFLAGS) +libiso9660_a_SOURCES = iso9660.c iso9660_fs.c rock.c xa.c +libiso9660_a_CFLAGS = -DHAVE_CONFIG_H -I. -I.. -I../driver $(AM_CFLAGS) all: all-am .SUFFIXES: @@ -257,14 +257,6 @@ libiso9660_a-xa.obj: xa.c $(AM_V_CC) @AM_BACKSLASH@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libiso9660_a_CFLAGS) $(CFLAGS) -c -o libiso9660_a-xa.obj `if test -f 'xa.c'; then $(CYGPATH_W) 'xa.c'; else $(CYGPATH_W) '$(srcdir)/xa.c'; fi` -libiso9660_a-utf8.o: utf8.c - $(AM_V_CC) @AM_BACKSLASH@ - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libiso9660_a_CFLAGS) $(CFLAGS) -c -o libiso9660_a-utf8.o `test -f 'utf8.c' || echo '$(srcdir)/'`utf8.c - -libiso9660_a-utf8.obj: utf8.c - $(AM_V_CC) @AM_BACKSLASH@ - $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libiso9660_a_CFLAGS) $(CFLAGS) -c -o libiso9660_a-utf8.obj `if test -f 'utf8.c'; then $(CYGPATH_W) 'utf8.c'; else $(CYGPATH_W) '$(srcdir)/utf8.c'; fi` - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ diff --git a/src/libcdio/udf/.msvc/udf_sources b/src/libcdio/udf/.msvc/udf_sources index da27ab86..f24f9494 100644 --- a/src/libcdio/udf/.msvc/udf_sources +++ b/src/libcdio/udf/.msvc/udf_sources @@ -2,7 +2,8 @@ TARGETNAME=udf TARGETTYPE=LIBRARY INCLUDES=$(DDK_INC_PATH);.;..;..\driver;..\..\msvc-missing -C_DEFINES=$(C_DEFINES) /DDDKBUILD /DUNICODE /D_UNICODE /DISOLATION_AWARE_ENABLED +LIBCDIO_DEFINES = /DHAVE_CONFIG_H /D_OFF_T_DEFINED /D_off_t=__int64 /Doff_t=_off_t /D_FILE_OFFSET_BITS=64 +C_DEFINES=$(C_DEFINES) $(LIBCDIO_DEFINES) /DDDKBUILD /DUNICODE /D_UNICODE /DISOLATION_AWARE_ENABLED !IFNDEF MSC_WARNING_LEVEL MSC_WARNING_LEVEL=/W3 diff --git a/src/libcdio/udf/Makefile.am b/src/libcdio/udf/Makefile.am index 0a328eaa..f03657ce 100644 --- a/src/libcdio/udf/Makefile.am +++ b/src/libcdio/udf/Makefile.am @@ -1,3 +1,3 @@ noinst_LIBRARIES = libudf.a libudf_a_SOURCES = udf.c udf_file.c udf_fs.c udf_time.c filemode.c -libudf_a_CFLAGS = -I. -I.. -I../driver $(AM_CFLAGS) +libudf_a_CFLAGS = -DHAVE_CONFIG_H -I. -I.. -I../driver $(AM_CFLAGS) diff --git a/src/libcdio/udf/Makefile.in b/src/libcdio/udf/Makefile.in index 91be7fd6..fe85ab47 100644 --- a/src/libcdio/udf/Makefile.in +++ b/src/libcdio/udf/Makefile.in @@ -168,7 +168,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LIBRARIES = libudf.a libudf_a_SOURCES = udf.c udf_file.c udf_fs.c udf_time.c filemode.c -libudf_a_CFLAGS = -I. -I.. -I../driver $(AM_CFLAGS) +libudf_a_CFLAGS = -DHAVE_CONFIG_H -I. -I.. -I../driver $(AM_CFLAGS) all: all-am .SUFFIXES: diff --git a/src/libcdio/udf/udf_time.c b/src/libcdio/udf/udf_time.c index 64b49975..59989e81 100644 --- a/src/libcdio/udf/udf_time.c +++ b/src/libcdio/udf/udf_time.c @@ -103,7 +103,7 @@ static time_t year_seconds[MAX_YEAR_SECONDS]= { /*2038*/ SPY(68,17,0) }; -#if defined(HAVE_TIMEZONE_VAR) && !defined(__MINGW32__) +#if defined(HAVE_TIMEZONE_VAR) && !defined(_WIN32) extern long timezone; #endif diff --git a/src/rufus.rc b/src/rufus.rc index dd98beaf..2bce3926 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -33,7 +33,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 206, 278 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW -CAPTION "Rufus v1.0.7.145" +CAPTION "Rufus v1.0.7.146" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,94,236,50,14 @@ -70,7 +70,7 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,231,175,50,14,WS_GROUP CONTROL "http://rufus.akeo.ie",IDC_ABOUT_RUFUS_URL, "SysLink",WS_TABSTOP,46,47,114,9 - LTEXT "Version 1.0.7 (Build 145)",IDC_STATIC,46,19,78,8 + LTEXT "Version 1.0.7 (Build 146)",IDC_STATIC,46,19,78,8 PUSHBUTTON "License...",IDC_ABOUT_LICENSE,46,175,50,14,WS_GROUP EDITTEXT IDC_ABOUT_COPYRIGHTS,46,107,235,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL LTEXT "Report bugs or request enhancements at:",IDC_STATIC,46,66,187,8 @@ -208,8 +208,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,7,145 - PRODUCTVERSION 1,0,7,145 + FILEVERSION 1,0,7,146 + PRODUCTVERSION 1,0,7,146 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -226,13 +226,13 @@ BEGIN BEGIN VALUE "CompanyName", "akeo.ie" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.0.7.145" + VALUE "FileVersion", "1.0.7.146" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "1.0.7.145" + VALUE "ProductVersion", "1.0.7.146" END END BLOCK "VarFileInfo" diff --git a/src/syslinux/libfat/.msvc/libfat.vcxproj b/src/syslinux/libfat/.msvc/libfat.vcxproj index 537e845a..f13c4c0b 100644 --- a/src/syslinux/libfat/.msvc/libfat.vcxproj +++ b/src/syslinux/libfat/.msvc/libfat.vcxproj @@ -96,7 +96,7 @@ Level3 Disabled - _CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;ISOLATION_AWARE_ENABLED;_LIB;%(PreprocessorDefinitions) + inline=__inline;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) ..;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) MultiThreadedDebug ProgramDatabase @@ -116,7 +116,7 @@ MaxSpeed true - _CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;ISOLATION_AWARE_ENABLED;_LIB;%(PreprocessorDefinitions) + inline=__inline;%(PreprocessorDefinitions) ..;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) MultiThreaded ProgramDatabase @@ -131,7 +131,7 @@ Level3 Disabled - _CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;ISOLATION_AWARE_ENABLED;_LIB;%(PreprocessorDefinitions) + inline=__inline;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) ..;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) MultiThreadedDebug ProgramDatabase @@ -151,7 +151,7 @@ MaxSpeed true - _CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;ISOLATION_AWARE_ENABLED;_LIB;%(PreprocessorDefinitions) + inline=__inline;%(PreprocessorDefinitions) ..;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) MultiThreaded ProgramDatabase diff --git a/src/syslinux/libfat/.msvc/libfat_sources b/src/syslinux/libfat/.msvc/libfat_sources index 61a1e85c..49e50780 100644 --- a/src/syslinux/libfat/.msvc/libfat_sources +++ b/src/syslinux/libfat/.msvc/libfat_sources @@ -2,7 +2,7 @@ TARGETNAME=libfat TARGETTYPE=LIBRARY INCLUDES=$(DDK_INC_PATH);..\..\msvc-missing -C_DEFINES=$(C_DEFINES) /DDDKBUILD /DUNICODE /D_UNICODE /DISOLATION_AWARE_ENABLED +C_DEFINES=$(C_DEFINES) /Dinline=__inline /DDDKBUILD /DUNICODE /D_UNICODE /DISOLATION_AWARE_ENABLED !IFNDEF MSC_WARNING_LEVEL MSC_WARNING_LEVEL=/W3 diff --git a/src/syslinux/libinstaller/.msvc/libinstaller.vcxproj b/src/syslinux/libinstaller/.msvc/libinstaller.vcxproj index c0f794ff..2bc9a374 100644 --- a/src/syslinux/libinstaller/.msvc/libinstaller.vcxproj +++ b/src/syslinux/libinstaller/.msvc/libinstaller.vcxproj @@ -94,7 +94,7 @@ Level3 Disabled - _CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;ISOLATION_AWARE_ENABLED;_LIB;%(PreprocessorDefinitions) + inline=__inline;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) ..;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) MultiThreadedDebug ProgramDatabase @@ -114,7 +114,7 @@ MaxSpeed true - _CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;ISOLATION_AWARE_ENABLED;_LIB;%(PreprocessorDefinitions) + inline=__inline;%(PreprocessorDefinitions) ..;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) MultiThreaded ProgramDatabase @@ -129,7 +129,7 @@ Level3 Disabled - _CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;ISOLATION_AWARE_ENABLED;_LIB;%(PreprocessorDefinitions) + inline=__inline;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) ..;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) MultiThreadedDebug ProgramDatabase @@ -149,7 +149,7 @@ MaxSpeed true - _CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;ISOLATION_AWARE_ENABLED;_LIB;%(PreprocessorDefinitions) + inline=__inline;%(PreprocessorDefinitions) ..;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) MultiThreaded ProgramDatabase diff --git a/src/syslinux/libinstaller/.msvc/libinstaller_sources b/src/syslinux/libinstaller/.msvc/libinstaller_sources index 171bdae9..10b20516 100644 --- a/src/syslinux/libinstaller/.msvc/libinstaller_sources +++ b/src/syslinux/libinstaller/.msvc/libinstaller_sources @@ -2,7 +2,7 @@ TARGETNAME=libinstaller TARGETTYPE=LIBRARY INCLUDES=$(DDK_INC_PATH);..\..\msvc-missing -C_DEFINES=$(C_DEFINES) /DDDKBUILD /DUNICODE /D_UNICODE /DISOLATION_AWARE_ENABLED +C_DEFINES=$(C_DEFINES) /Dinline=__inline /DDDKBUILD /DUNICODE /D_UNICODE /DISOLATION_AWARE_ENABLED !IFNDEF MSC_WARNING_LEVEL MSC_WARNING_LEVEL=/W3