From 2826c784f10beb915d733a240df203c465c2fbcf Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Tue, 31 Jan 2012 01:07:20 +0000 Subject: [PATCH] [iso] final fixup before mainline integration --- src/.msvc/iso.vcxproj | 8 ++--- src/.msvc/rufus_2010.vcxproj | 12 ++++--- src/.msvc/rufus_2010.vcxproj.filters | 12 +++++++ src/iso.c | 24 ++++---------- src/libcdio/config.h | 1 + src/libcdio/driver/.msvc/driver.vcxproj | 17 +++++++--- .../driver/.msvc/driver.vcxproj.filters | 27 ++++++++++++++++ src/libcdio/driver/Makefile.am | 3 +- src/libcdio/driver/Makefile.in | 3 +- src/libcdio/driver/cdio_assert.h | 4 +-- src/libcdio/iso9660/.msvc/iso9660.vcxproj | 20 +++++++++--- .../iso9660/.msvc/iso9660.vcxproj.filters | 32 ++++++++++++++++++- src/libcdio/iso9660/Makefile.am | 3 +- src/libcdio/iso9660/Makefile.in | 3 +- src/libcdio/iso9660/rock.c | 3 +- src/libcdio/udf/.msvc/udf.vcxproj | 13 +++++--- src/libcdio/udf/.msvc/udf.vcxproj.filters | 13 ++++++-- src/libcdio/udf/Makefile.am | 3 +- src/libcdio/udf/Makefile.in | 3 +- src/ms-sys/.msvc/ms-sys.vcxproj | 8 ++--- src/rufus.rc | 12 +++---- 21 files changed, 162 insertions(+), 62 deletions(-) diff --git a/src/.msvc/iso.vcxproj b/src/.msvc/iso.vcxproj index 76b71d6e..04748a2a 100644 --- a/src/.msvc/iso.vcxproj +++ b/src/.msvc/iso.vcxproj @@ -77,7 +77,7 @@ - ISO_TEST;_CRT_SECURE_NO_WARNINGS;_CRTDBG_MAP_ALLOC;HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + ISO_TEST;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_WARNINGS;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) MultiThreadedDebug Level3 ..\msvc-missing;..\libcdio;%(AdditionalIncludeDirectories) @@ -100,7 +100,7 @@ ..\msvc-missing;..\libcdio;%(AdditionalIncludeDirectories) - ISO_TEST;_CRT_SECURE_NO_WARNINGS;_CRTDBG_MAP_ALLOC;HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + ISO_TEST;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_WARNINGS;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) MultiThreadedDebug Level3 ProgramDatabase @@ -119,7 +119,7 @@ - ISO_TEST;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + ISO_TEST;_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;HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + ISO_TEST;_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/.msvc/rufus_2010.vcxproj b/src/.msvc/rufus_2010.vcxproj index 8a83b0d8..e44c7d7f 100644 --- a/src/.msvc/rufus_2010.vcxproj +++ b/src/.msvc/rufus_2010.vcxproj @@ -77,7 +77,7 @@ - _CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;ISOLATION_AWARE_ENABLED;%(PreprocessorDefinitions) + _OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_CRT_SECURE_NO_WARNINGS;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) MultiThreadedDebug Level3 ..\msvc-missing;..\ms-sys\inc;..\syslinux\libinstaller;..\syslinux\libfat;..\libcdio;%(AdditionalIncludeDirectories) @@ -100,7 +100,7 @@ ..\msvc-missing;..\ms-sys\inc;..\syslinux\libinstaller;..\syslinux\libfat;..\libcdio;%(AdditionalIncludeDirectories) - _CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;ISOLATION_AWARE_ENABLED;%(PreprocessorDefinitions) + _OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_CRT_SECURE_NO_WARNINGS;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) MultiThreadedDebug Level3 ProgramDatabase @@ -119,7 +119,7 @@ - _CRT_SECURE_NO_WARNINGS;ISOLATION_AWARE_ENABLED;%(PreprocessorDefinitions) + _OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded Level3 ..\msvc-missing;..\ms-sys\inc;..\syslinux\libinstaller;..\syslinux\libfat;..\libcdio;%(AdditionalIncludeDirectories) @@ -141,7 +141,7 @@ X64 - _CRT_SECURE_NO_WARNINGS;ISOLATION_AWARE_ENABLED;%(PreprocessorDefinitions) + _OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded Level3 ..\msvc-missing;..\ms-sys\inc;..\syslinux\libinstaller;..\syslinux\libfat;..\libcdio;%(AdditionalIncludeDirectories) @@ -173,6 +173,10 @@ + + + + diff --git a/src/.msvc/rufus_2010.vcxproj.filters b/src/.msvc/rufus_2010.vcxproj.filters index b135c92b..0b9d20a7 100644 --- a/src/.msvc/rufus_2010.vcxproj.filters +++ b/src/.msvc/rufus_2010.vcxproj.filters @@ -74,6 +74,18 @@ Header Files + + Header Files + + + Header Files + + + Header Files + + + Header Files + diff --git a/src/iso.c b/src/iso.c index a5cf1f6a..b8f74479 100644 --- a/src/iso.c +++ b/src/iso.c @@ -30,26 +30,14 @@ #include #include #include +#include #include #include #include #include -#if defined(_WIN32) -#include -#define snprintf _snprintf -#else -#include -#include -#define _mkdir(a) mkdir(a, S_IRWXU) -#endif - -#ifndef ISO_TEST #include "rufus.h" -#else -#define uprintf printf -#endif #ifndef MIN #define MIN(a,b) (((a) < (b)) ? (a) : (b)) @@ -69,7 +57,7 @@ void cdio_destroy (CdIo_t *p_cdio) {} const char *psz_extract_dir = "D:/tmp/iso"; -// TODO: Unicode support, timestamp preservation +// TODO: Unicode support, progress computation, timestamp preservation static int udf_extract_files(udf_t *p_udf, udf_dirent_t *p_udf_dirent, const char *psz_path) { @@ -86,13 +74,13 @@ static int udf_extract_files(udf_t *p_udf, udf_dirent_t *p_udf_dirent, const cha while (udf_readdir(p_udf_dirent)) { psz_basename = udf_get_filename(p_udf_dirent); - i_length = 3 + strlen(psz_path) + strlen(psz_basename) + strlen(psz_extract_dir); + i_length = (int)(3 + strlen(psz_path) + strlen(psz_basename) + strlen(psz_extract_dir)); psz_fullpath = (char*)calloc(sizeof(char), i_length); if (psz_fullpath == NULL) { uprintf("Error allocating file name\n"); goto out; } - i_length = snprintf(psz_fullpath, i_length, "%s%s/%s", psz_extract_dir, psz_path, psz_basename); + i_length = _snprintf(psz_fullpath, i_length, "%s%s/%s", psz_extract_dir, psz_path, psz_basename); if (i_length < 0) { goto out; } @@ -156,7 +144,7 @@ static int iso_extract_files(iso9660_t* p_iso, const char *psz_path) if ((p_iso == NULL) || (psz_path == NULL)) return 1; - i_length = snprintf(psz_fullpath, sizeof(psz_fullpath), "%s%s/", psz_extract_dir, psz_path); + i_length = _snprintf(psz_fullpath, sizeof(psz_fullpath), "%s%s/", psz_extract_dir, psz_path); if (i_length < 0) return 1; psz_basename = &psz_fullpath[i_length]; @@ -186,7 +174,7 @@ static int iso_extract_files(iso9660_t* p_iso, const char *psz_path) i_file_length = p_statbuf->size; for (i = 0; i_file_length > 0; i++) { memset(buf, 0, ISO_BLOCKSIZE); - lsn = p_statbuf->lsn + i; + lsn = p_statbuf->lsn + (lsn_t)i; if (iso9660_iso_seek_read(p_iso, buf, lsn, 1) != ISO_BLOCKSIZE) { uprintf(" Error reading ISO9660 file %s at LSN %lu\n", psz_iso_name, (long unsigned int)lsn); diff --git a/src/libcdio/config.h b/src/libcdio/config.h index a23bd625..6bad847e 100644 --- a/src/libcdio/config.h +++ b/src/libcdio/config.h @@ -8,6 +8,7 @@ /* Disable: warning C4242: conversion from 'x' to 'y', possible loss of data */ #pragma warning(disable:4242) /* 32 bit */ #pragma warning(disable:4244) /* 64 bit */ +#pragma warning(disable:4267) /* 64 bit */ #endif /* what to put between the brackets for empty arrays */ diff --git a/src/libcdio/driver/.msvc/driver.vcxproj b/src/libcdio/driver/.msvc/driver.vcxproj index 2e9682c7..d4e9f209 100644 --- a/src/libcdio/driver/.msvc/driver.vcxproj +++ b/src/libcdio/driver/.msvc/driver.vcxproj @@ -31,9 +31,18 @@ + + + + + + + + + @@ -103,7 +112,7 @@ Level3 Disabled - _CRTDBG_MAP_ALLOC;HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) ..;..\..;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) MultiThreadedDebug ProgramDatabase @@ -123,7 +132,7 @@ MaxSpeed true - _CRTDBG_MAP_ALLOC;HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) ..;..\..;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) MultiThreaded ProgramDatabase @@ -138,7 +147,7 @@ Level3 Disabled - _CRTDBG_MAP_ALLOC;HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) ..;..\..;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) MultiThreadedDebug ProgramDatabase @@ -158,7 +167,7 @@ MaxSpeed true - _CRTDBG_MAP_ALLOC;HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) ..;..\..;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) MultiThreaded ProgramDatabase diff --git a/src/libcdio/driver/.msvc/driver.vcxproj.filters b/src/libcdio/driver/.msvc/driver.vcxproj.filters index 64ef17db..b2ef477e 100644 --- a/src/libcdio/driver/.msvc/driver.vcxproj.filters +++ b/src/libcdio/driver/.msvc/driver.vcxproj.filters @@ -58,5 +58,32 @@ Header Files + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + \ No newline at end of file diff --git a/src/libcdio/driver/Makefile.am b/src/libcdio/driver/Makefile.am index 4c5ad28c..43082829 100644 --- a/src/libcdio/driver/Makefile.am +++ b/src/libcdio/driver/Makefile.am @@ -1,3 +1,4 @@ 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 utf8.c -libdriver_a_CFLAGS = -DHAVE_CONFIG_H -I. -I.. $(AM_CFLAGS) +# Boy do you NOT want to have HAVE_CONFIG_H set before $(AM_CFLAGS) with Clang! +libdriver_a_CFLAGS = $(AM_CFLAGS) -DHAVE_CONFIG_H -I. -I.. diff --git a/src/libcdio/driver/Makefile.in b/src/libcdio/driver/Makefile.in index f56c11cc..b6a2308d 100644 --- a/src/libcdio/driver/Makefile.in +++ b/src/libcdio/driver/Makefile.in @@ -171,7 +171,8 @@ 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 utf8.c -libdriver_a_CFLAGS = -DHAVE_CONFIG_H -I. -I.. $(AM_CFLAGS) +# Boy do you NOT want to have HAVE_CONFIG_H set before $(AM_CFLAGS) with Clang! +libdriver_a_CFLAGS = $(AM_CFLAGS) -DHAVE_CONFIG_H -I. -I.. all: all-am .SUFFIXES: diff --git a/src/libcdio/driver/cdio_assert.h b/src/libcdio/driver/cdio_assert.h index 81dc2b6b..31d8f65a 100644 --- a/src/libcdio/driver/cdio_assert.h +++ b/src/libcdio/driver/cdio_assert.h @@ -19,7 +19,7 @@ #ifndef __CDIO_ASSERT_H__ #define __CDIO_ASSERT_H__ -#if defined(__GNUC__) +#if defined(__GNUC__) && !defined(__MINGW32__) #if defined(HAVE_CONFIG_H) && !defined(__CDIO_CONFIG_H__) # include "config.h" @@ -43,7 +43,7 @@ __FILE__, __LINE__, __PRETTY_FUNCTION__); \ } -#else /* non GNU C */ +#else /* non GNU C or MinGW */ #include diff --git a/src/libcdio/iso9660/.msvc/iso9660.vcxproj b/src/libcdio/iso9660/.msvc/iso9660.vcxproj index ca378221..512ffd8b 100644 --- a/src/libcdio/iso9660/.msvc/iso9660.vcxproj +++ b/src/libcdio/iso9660/.msvc/iso9660.vcxproj @@ -19,7 +19,17 @@ - + + + + + + + + + + + @@ -94,7 +104,7 @@ Level3 Disabled - _CRTDBG_MAP_ALLOC;HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) ..;..\..;..\..\driver;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) MultiThreadedDebug ProgramDatabase @@ -114,7 +124,7 @@ MaxSpeed true - _CRTDBG_MAP_ALLOC;HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) ..;..\..;..\..\driver;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) MultiThreaded ProgramDatabase @@ -129,7 +139,7 @@ Level3 Disabled - _CRTDBG_MAP_ALLOC;HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) ..;..\..;..\..\driver;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) MultiThreadedDebug ProgramDatabase @@ -149,7 +159,7 @@ MaxSpeed true - _CRTDBG_MAP_ALLOC;HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) ..;..\..;..\..\driver;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) MultiThreaded ProgramDatabase diff --git a/src/libcdio/iso9660/.msvc/iso9660.vcxproj.filters b/src/libcdio/iso9660/.msvc/iso9660.vcxproj.filters index fd15c866..d49402f2 100644 --- a/src/libcdio/iso9660/.msvc/iso9660.vcxproj.filters +++ b/src/libcdio/iso9660/.msvc/iso9660.vcxproj.filters @@ -14,7 +14,37 @@ Header Files - + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + Header Files diff --git a/src/libcdio/iso9660/Makefile.am b/src/libcdio/iso9660/Makefile.am index 862ce3f5..61690208 100644 --- a/src/libcdio/iso9660/Makefile.am +++ b/src/libcdio/iso9660/Makefile.am @@ -1,3 +1,4 @@ noinst_LIBRARIES = libiso9660.a libiso9660_a_SOURCES = iso9660.c iso9660_fs.c rock.c xa.c -libiso9660_a_CFLAGS = -DHAVE_CONFIG_H -I. -I.. -I../driver $(AM_CFLAGS) +# Boy do you NOT want to have HAVE_CONFIG_H set before $(AM_CFLAGS) with Clang! +libiso9660_a_CFLAGS = $(AM_CFLAGS) -DHAVE_CONFIG_H -I. -I.. -I../driver diff --git a/src/libcdio/iso9660/Makefile.in b/src/libcdio/iso9660/Makefile.in index 123f0d77..508f00cb 100644 --- a/src/libcdio/iso9660/Makefile.in +++ b/src/libcdio/iso9660/Makefile.in @@ -168,7 +168,8 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LIBRARIES = libiso9660.a libiso9660_a_SOURCES = iso9660.c iso9660_fs.c rock.c xa.c -libiso9660_a_CFLAGS = -DHAVE_CONFIG_H -I. -I.. -I../driver $(AM_CFLAGS) +# Boy do you NOT want to have HAVE_CONFIG_H set before $(AM_CFLAGS) with Clang! +libiso9660_a_CFLAGS = $(AM_CFLAGS) -DHAVE_CONFIG_H -I. -I.. -I../driver all: all-am .SUFFIXES: diff --git a/src/libcdio/iso9660/rock.c b/src/libcdio/iso9660/rock.c index 8ed11904..d134fd94 100644 --- a/src/libcdio/iso9660/rock.c +++ b/src/libcdio/iso9660/rock.c @@ -101,7 +101,8 @@ realloc_symlink(/*in/out*/ iso9660_stat_t *p_stat, uint8_t i_grow) #define CHECK_CE \ { cont_extent = from_733(*rr->u.CE.extent); \ cont_offset = from_733(*rr->u.CE.offset); \ - cont_size = from_733(*rr->u.CE.size); } + cont_size = from_733(*rr->u.CE.size); \ + (void)cont_extent; (void)cont_offset, (void)cont_size; } #define SETUP_ROCK_RIDGE(DE,CHR,LEN) \ { \ diff --git a/src/libcdio/udf/.msvc/udf.vcxproj b/src/libcdio/udf/.msvc/udf.vcxproj index 9bb14788..5899df79 100644 --- a/src/libcdio/udf/.msvc/udf.vcxproj +++ b/src/libcdio/udf/.msvc/udf.vcxproj @@ -26,8 +26,11 @@ - + + + + @@ -97,7 +100,7 @@ Level3 Disabled - _CRTDBG_MAP_ALLOC;HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) ..;..\..;..\..\driver;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) MultiThreadedDebug ProgramDatabase @@ -117,7 +120,7 @@ MaxSpeed true - _CRTDBG_MAP_ALLOC;HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) ..;..\..;..\..\driver;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) MultiThreaded ProgramDatabase @@ -132,7 +135,7 @@ Level3 Disabled - _CRTDBG_MAP_ALLOC;HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) ..;..\..;..\..\driver;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) MultiThreadedDebug ProgramDatabase @@ -152,7 +155,7 @@ MaxSpeed true - _CRTDBG_MAP_ALLOC;HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) ..;..\..;..\..\driver;..\..\..\msvc-missing;%(AdditionalIncludeDirectories) MultiThreaded ProgramDatabase diff --git a/src/libcdio/udf/.msvc/udf.vcxproj.filters b/src/libcdio/udf/.msvc/udf.vcxproj.filters index 21b04bb8..c3996225 100644 --- a/src/libcdio/udf/.msvc/udf.vcxproj.filters +++ b/src/libcdio/udf/.msvc/udf.vcxproj.filters @@ -34,10 +34,19 @@ Header Files - + Header Files - + + Header Files + + + Header Files + + + Header Files + + Header Files diff --git a/src/libcdio/udf/Makefile.am b/src/libcdio/udf/Makefile.am index f03657ce..5e101028 100644 --- a/src/libcdio/udf/Makefile.am +++ b/src/libcdio/udf/Makefile.am @@ -1,3 +1,4 @@ noinst_LIBRARIES = libudf.a libudf_a_SOURCES = udf.c udf_file.c udf_fs.c udf_time.c filemode.c -libudf_a_CFLAGS = -DHAVE_CONFIG_H -I. -I.. -I../driver $(AM_CFLAGS) +# Boy do you NOT want to have HAVE_CONFIG_H set before $(AM_CFLAGS) with Clang! +libudf_a_CFLAGS = $(AM_CFLAGS) -DHAVE_CONFIG_H -I. -I.. -I../driver diff --git a/src/libcdio/udf/Makefile.in b/src/libcdio/udf/Makefile.in index fe85ab47..f5b2592b 100644 --- a/src/libcdio/udf/Makefile.in +++ b/src/libcdio/udf/Makefile.in @@ -168,7 +168,8 @@ 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 = -DHAVE_CONFIG_H -I. -I.. -I../driver $(AM_CFLAGS) +# Boy do you NOT want to have HAVE_CONFIG_H set before $(AM_CFLAGS) with Clang! +libudf_a_CFLAGS = $(AM_CFLAGS) -DHAVE_CONFIG_H -I. -I.. -I../driver all: all-am .SUFFIXES: diff --git a/src/ms-sys/.msvc/ms-sys.vcxproj b/src/ms-sys/.msvc/ms-sys.vcxproj index 5c559a75..5d16e7a6 100644 --- a/src/ms-sys/.msvc/ms-sys.vcxproj +++ b/src/ms-sys/.msvc/ms-sys.vcxproj @@ -122,7 +122,7 @@ Level3 Disabled - _CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;ISOLATION_AWARE_ENABLED;_LIB;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) ../inc;%(AdditionalIncludeDirectories) MultiThreadedDebug ProgramDatabase @@ -142,7 +142,7 @@ MaxSpeed true - _CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;ISOLATION_AWARE_ENABLED;_LIB;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ../inc;%(AdditionalIncludeDirectories) MultiThreaded ProgramDatabase @@ -157,7 +157,7 @@ Level3 Disabled - _CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;ISOLATION_AWARE_ENABLED;_LIB;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) ../inc;%(AdditionalIncludeDirectories) MultiThreadedDebug ProgramDatabase @@ -177,7 +177,7 @@ MaxSpeed true - _CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;ISOLATION_AWARE_ENABLED;_LIB;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ../inc;%(AdditionalIncludeDirectories) MultiThreaded ProgramDatabase diff --git a/src/rufus.rc b/src/rufus.rc index 66c0dd59..8aaa8b6f 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.148" +CAPTION "Rufus v1.0.7.150" 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 148)",IDC_STATIC,46,19,78,8 + LTEXT "Version 1.0.7 (Build 150)",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,148 - PRODUCTVERSION 1,0,7,148 + FILEVERSION 1,0,7,150 + PRODUCTVERSION 1,0,7,150 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -226,13 +226,13 @@ BEGIN BEGIN VALUE "CompanyName", "akeo.ie" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.0.7.148" + VALUE "FileVersion", "1.0.7.150" 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.148" + VALUE "ProductVersion", "1.0.7.150" END END BLOCK "VarFileInfo"