[PATCH] Remove MSVS 2005 and 2008 support

lvqcl <[email protected]>
Newsgroups gmane.comp.audio.compression.flac.devel
Message-ID <CAC1tzkjoXRe+coaw5Hf5rv3G3A7ZAiA6o=OMCc5wcTGw3YFsMw@mail.gmail.com> 
This patch removes support of Visual Studio 2005 and 2008. After this
patch, the minimum supported version is MSVS 2010.

I split the patch into 4 parts to simplify its review.

part 1: remove all outdated files.
part 2: remove references to these files from Makefile.am.
part 3: update 'Building with MSVC' part of README.
part 4: remove unnecessary parts of header files.

_______________________________________________
flac-dev mailing list
[email protected]
http://lists.xiph.org/mailman/listinfo/flac-dev
01-delete-files.patch.zip (application/x-zip-compressed, 7.8 KB) - not displayed
02-fix-makefile-am-files.patch (application/octet-stream, 7.9 KB) 
diff --git a/Makefile.am b/Makefile.am
index 38aea04..ba59565 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,6 @@ EXTRA_DIST = \
 	COPYING.LGPL \
 	COPYING.Xiph \
 	FLAC.sln \
-	FLAC-vs2005.sln \
 	Makefile.lite \
 	Makefile.deps \
 	autogen.sh \
diff --git a/examples/c/decode/file/Makefile.am b/examples/c/decode/file/Makefile.am
index 7f4c922..3297709 100644
--- a/examples/c/decode/file/Makefile.am
+++ b/examples/c/decode/file/Makefile.am
@@ -18,7 +18,6 @@
 
 EXTRA_DIST = \
 	Makefile.lite \
-	example_c_decode_file.vcproj \
 	example_c_decode_file.vcxproj \
 	example_c_decode_file.vcxproj.filters
 
diff --git a/examples/c/encode/file/Makefile.am b/examples/c/encode/file/Makefile.am
index 8c247a6..94e2ca7 100644
--- a/examples/c/encode/file/Makefile.am
+++ b/examples/c/encode/file/Makefile.am
@@ -18,7 +18,6 @@
 
 EXTRA_DIST = \
 	Makefile.lite \
-	example_c_encode_file.vcproj \
 	example_c_encode_file.vcxproj \
 	example_c_encode_file.vcxproj.filters
 
diff --git a/examples/cpp/decode/file/Makefile.am b/examples/cpp/decode/file/Makefile.am
index 31ad6d3..e0883f4 100644
--- a/examples/cpp/decode/file/Makefile.am
+++ b/examples/cpp/decode/file/Makefile.am
@@ -18,7 +18,6 @@
 
 EXTRA_DIST = \
 	Makefile.lite \
-	example_cpp_decode_file.vcproj \
 	example_cpp_decode_file.vcxproj \
 	example_cpp_decode_file.vcxproj.filters
 
diff --git a/examples/cpp/encode/file/Makefile.am b/examples/cpp/encode/file/Makefile.am
index 972e09a..a222a69 100644
--- a/examples/cpp/encode/file/Makefile.am
+++ b/examples/cpp/encode/file/Makefile.am
@@ -18,7 +18,6 @@
 
 EXTRA_DIST = \
 	Makefile.lite \
-	example_cpp_encode_file.vcproj \
 	example_cpp_encode_file.vcxproj \
 	example_cpp_encode_file.vcxproj.filters
 
diff --git a/include/share/Makefile.am b/include/share/Makefile.am
index 079c169..2d8ca50 100644
--- a/include/share/Makefile.am
+++ b/include/share/Makefile.am
@@ -9,7 +9,6 @@ EXTRA_DIST = \
 	getopt.h \
 	grabbag.h \
 	macros.h \
-	msvc2005_int.h \
 	private.h \
 	replaygain_analysis.h \
 	replaygain_synthesis.h \
diff --git a/src/flac/Makefile.am b/src/flac/Makefile.am
index fe6fa48..a7d1a1c 100644
--- a/src/flac/Makefile.am
+++ b/src/flac/Makefile.am
@@ -23,11 +23,9 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
 EXTRA_DIST = \
 	Makefile.lite \
 	Makefile.lite.iffscan \
-	flac.vcproj \
 	flac.vcxproj \
 	flac.vcxproj.filters \
 	iffscan.c \
-	iffscan.vcproj \
 	iffscan.vcxproj \
 	iffscan.vcxproj.filters
 
diff --git a/src/libFLAC++/Makefile.am b/src/libFLAC++/Makefile.am
index 41b9576..491c108 100644
--- a/src/libFLAC++/Makefile.am
+++ b/src/libFLAC++/Makefile.am
@@ -40,10 +40,8 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
 EXTRA_DIST = \
 	Makefile.lite \
 	flac++.pc.in \
-	libFLAC++_dynamic.vcproj \
 	libFLAC++_dynamic.vcxproj \
 	libFLAC++_dynamic.vcxproj.filters \
-	libFLAC++_static.vcproj \
 	libFLAC++_static.vcxproj \
 	libFLAC++_static.vcxproj.filters \
 	libFLAC++.m4
diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am
index 863f7f9..78542c0 100644
--- a/src/libFLAC/Makefile.am
+++ b/src/libFLAC/Makefile.am
@@ -74,10 +74,8 @@ pkgconfig_DATA = flac.pc
 EXTRA_DIST = \
 	Makefile.lite \
 	flac.pc.in \
-	libFLAC_dynamic.vcproj \
 	libFLAC_dynamic.vcxproj \
 	libFLAC_dynamic.vcxproj.filters \
-	libFLAC_static.vcproj \
 	libFLAC_static.vcxproj \
 	libFLAC_static.vcxproj.filters \
 	libFLAC.m4 \
diff --git a/src/metaflac/Makefile.am b/src/metaflac/Makefile.am
index ec201dd..4a8c918 100644
--- a/src/metaflac/Makefile.am
+++ b/src/metaflac/Makefile.am
@@ -22,7 +22,6 @@ AM_CFLAGS = @OGG_CFLAGS@
 AM_CPPFLAGS = -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
 EXTRA_DIST = \
 	Makefile.lite \
-	metaflac.vcproj \
 	metaflac.vcxproj \
 	metaflac.vcxproj.filters
 
diff --git a/src/share/Makefile.am b/src/share/Makefile.am
index 8e3984a..4e05bb6 100644
--- a/src/share/Makefile.am
+++ b/src/share/Makefile.am
@@ -24,30 +24,24 @@ EXTRA_DIST = \
 	Makefile.lite \
 	README \
 	getopt/Makefile.lite \
-	getopt/getopt_static.vcproj \
 	getopt/getopt_static.vcxproj \
 	getopt/getopt_static.vcxproj.filters \
 	grabbag/Makefile.lite \
-	grabbag/grabbag_static.vcproj \
 	grabbag/grabbag_static.vcxproj \
 	grabbag/grabbag_static.vcxproj.filters \
 	replaygain_analysis/Makefile.lite \
-	replaygain_analysis/replaygain_analysis_static.vcproj \
 	replaygain_analysis/replaygain_analysis_static.vcxproj \
 	replaygain_analysis/replaygain_analysis_static.vcxproj.filters \
 	replaygain_synthesis/Makefile.lite \
-	replaygain_synthesis/replaygain_synthesis_static.vcproj \
 	replaygain_synthesis/replaygain_synthesis_static.vcxproj \
 	replaygain_synthesis/replaygain_synthesis_static.vcxproj.filters \
 	utf8/Makefile.lite \
 	utf8/charmaps.h \
 	utf8/makemap.c \
 	utf8/charset_test.c \
-	utf8/utf8_static.vcproj \
 	utf8/utf8_static.vcxproj \
 	utf8/utf8_static.vcxproj.filters \
 	win_utf8_io/Makefile.lite \
-	win_utf8_io/win_utf8_io_static.vcproj \
 	win_utf8_io/win_utf8_io_static.vcxproj \
 	win_utf8_io/win_utf8_io_static.vcxproj.filters
 
diff --git a/src/test_grabbag/cuesheet/Makefile.am b/src/test_grabbag/cuesheet/Makefile.am
index 59ae71f..6fb55f2 100644
--- a/src/test_grabbag/cuesheet/Makefile.am
+++ b/src/test_grabbag/cuesheet/Makefile.am
@@ -18,7 +18,6 @@
 
 EXTRA_DIST = \
 	Makefile.lite \
-	test_cuesheet.vcproj \
 	test_cuesheet.vcxproj \
 	test_cuesheet.vcxproj.filters
 
diff --git a/src/test_grabbag/picture/Makefile.am b/src/test_grabbag/picture/Makefile.am
index 0ee04a4..fdad614 100644
--- a/src/test_grabbag/picture/Makefile.am
+++ b/src/test_grabbag/picture/Makefile.am
@@ -18,7 +18,6 @@
 
 EXTRA_DIST = \
 	Makefile.lite \
-	test_picture.vcproj \
 	test_picture.vcxproj \
 	test_picture.vcxproj.filters
 
diff --git a/src/test_libFLAC++/Makefile.am b/src/test_libFLAC++/Makefile.am
index 31830b2..cb95109 100644
--- a/src/test_libFLAC++/Makefile.am
+++ b/src/test_libFLAC++/Makefile.am
@@ -18,7 +18,6 @@
 
 EXTRA_DIST = \
 	Makefile.lite \
-	test_libFLAC++.vcproj \
 	test_libFLAC++.vcxproj \
 	test_libFLAC++.vcxproj.filters
 
diff --git a/src/test_libFLAC/Makefile.am b/src/test_libFLAC/Makefile.am
index 22e9453..a6f535a 100644
--- a/src/test_libFLAC/Makefile.am
+++ b/src/test_libFLAC/Makefile.am
@@ -18,7 +18,6 @@
 
 EXTRA_DIST = \
 	Makefile.lite \
-	test_libFLAC.vcproj \
 	test_libFLAC.vcxproj \
 	test_libFLAC.vcxproj.filters
 
diff --git a/src/test_libs_common/Makefile.am b/src/test_libs_common/Makefile.am
index 2bd11c9..de39d7c 100644
--- a/src/test_libs_common/Makefile.am
+++ b/src/test_libs_common/Makefile.am
@@ -27,6 +27,5 @@ libtest_libs_common_la_SOURCES = \
 EXTRA_DIST = \
 	Makefile.lite \
 	README \
-	test_libs_common_static.vcproj \
 	test_libs_common_static.vcxproj \
 	test_libs_common_static.vcxproj.filters
diff --git a/src/test_seeking/Makefile.am b/src/test_seeking/Makefile.am
index b7dd852..a9f18dc 100644
--- a/src/test_seeking/Makefile.am
+++ b/src/test_seeking/Makefile.am
@@ -18,7 +18,6 @@
 
 EXTRA_DIST = \
 	Makefile.lite \
-	test_seeking.vcproj \
 	test_seeking.vcxproj \
 	test_seeking.vcxproj.filters
 
diff --git a/src/test_streams/Makefile.am b/src/test_streams/Makefile.am
index fd66342..47be6cb 100644
--- a/src/test_streams/Makefile.am
+++ b/src/test_streams/Makefile.am
@@ -18,7 +18,6 @@
 
 EXTRA_DIST = \
 	Makefile.lite \
-	test_streams.vcproj \
 	test_streams.vcxproj \
 	test_streams.vcxproj.filters
 
diff --git a/src/utils/flacdiff/Makefile.am b/src/utils/flacdiff/Makefile.am
index 9191242..2cafc5a 100644
--- a/src/utils/flacdiff/Makefile.am
+++ b/src/utils/flacdiff/Makefile.am
@@ -18,7 +18,6 @@
 
 EXTRA_DIST = \
 	Makefile.lite \
-	flacdiff.vcproj \
 	flacdiff.vcxproj \
 	flacdiff.vcxproj.filters \
 	main.cpp
diff --git a/src/utils/flactimer/Makefile.am b/src/utils/flactimer/Makefile.am
index 3d9e91f..06e3db0 100644
--- a/src/utils/flactimer/Makefile.am
+++ b/src/utils/flactimer/Makefile.am
@@ -18,7 +18,6 @@
 
 EXTRA_DIST = \
 	Makefile.lite \
-	flactimer.vcproj \
 	flactimer.vcxproj \
 	flactimer.vcxproj.filters \
 	main.cpp
03-fix-readme.patch (application/octet-stream, 1 KB) 
diff --git a/README b/README
index dd5e6e7..eef1f38 100644
--- a/README
+++ b/README
@@ -210,8 +210,8 @@ not an x86, change -DFLAC__CPU_IA32 to -DFLAC__CPU_UNKNOWN.
 Building with MSVC
 ===============================================================================
 
-There are .vcproj projects and a master FLAC.sln solution to build all
-the libraries and executables with MSVC 2005 or newer.
+There are .vcxproj projects and a master FLAC.sln solution to build all
+the libraries and executables with MSVC 2010 or newer.
 
 Prerequisite: you must have the Ogg libraries installed as described
 later.
@@ -242,7 +242,7 @@ into FLAC's 'objs\release\lib' directory, and copy the entire include\ogg tree
 into FLAC's 'include' directory (so that there is an 'ogg' directory in FLAC's
 'include' directory with the files ogg.h, os_types.h and config_types.h).
 
-If you want to build without Ogg support, instead edit all .vcproj files
+If you want to build without Ogg support, instead edit all .vcxproj files
 and remove any "FLAC__HAS_OGG" definitions.
04-simplify-header-files.patch (application/octet-stream, 2.4 KB) 
diff --git a/include/FLAC/ordinals.h b/include/FLAC/ordinals.h
index 75b830d..243c71f 100644
--- a/include/FLAC/ordinals.h
+++ b/include/FLAC/ordinals.h
@@ -33,25 +33,6 @@
 #ifndef FLAC__ORDINALS_H
 #define FLAC__ORDINALS_H
 
-#if defined(_MSC_VER) && _MSC_VER < 1600
-
-/* Microsoft Visual Studio earlier than the 2010 version did not provide
- * the 1999 ISO C Standard header file <stdint.h>.
- */
-
-typedef signed __int8 FLAC__int8;
-typedef signed __int16 FLAC__int16;
-typedef signed __int32 FLAC__int32;
-typedef signed __int64 FLAC__int64;
-typedef unsigned __int8 FLAC__uint8;
-typedef unsigned __int16 FLAC__uint16;
-typedef unsigned __int32 FLAC__uint32;
-typedef unsigned __int64 FLAC__uint64;
-
-#else
-
-/* For MSVC 2010 and everything else which provides <stdint.h>. */
-
 #include <stdint.h>
 
 typedef int8_t FLAC__int8;
@@ -64,8 +45,6 @@ typedef uint16_t FLAC__uint16;
 typedef uint32_t FLAC__uint32;
 typedef uint64_t FLAC__uint64;
 
-#endif
-
 typedef int FLAC__bool;
 
 typedef FLAC__uint8 FLAC__byte;
diff --git a/include/share/compat.h b/include/share/compat.h
index 491b5cb..9b305e0 100644
--- a/include/share/compat.h
+++ b/include/share/compat.h
@@ -119,22 +119,13 @@
 #if defined _MSC_VER
 #  if _MSC_VER >= 1800
 #    include <inttypes.h>
-#  elif _MSC_VER >= 1600
-/* Visual Studio 2010 has decent C99 support */
+#  else
 #    include <stdint.h>
 #    define PRIu64 "llu"
 #    define PRId64 "lld"
 #    define PRIx64 "llx"
-#  else
-#    include <limits.h>
-#    ifndef UINT32_MAX
-#      define UINT32_MAX _UI32_MAX
-#    endif
-#    define PRIu64 "I64u"
-#    define PRId64 "I64d"
-#    define PRIx64 "I64x"
 #  endif
-#endif /* defined _MSC_VER */
+#endif
 
 #ifdef _WIN32
 /* All char* strings are in UTF-8 format. Added to support Unicode files on Windows */
diff --git a/src/libFLAC/include/private/cpu.h b/src/libFLAC/include/private/cpu.h
index 3fe279b..c1f80f4 100644
--- a/src/libFLAC/include/private/cpu.h
+++ b/src/libFLAC/include/private/cpu.h
@@ -80,10 +80,8 @@
   #define FLAC__SSE_TARGET(x)
   #define FLAC__SSE_SUPPORTED 1
   #define FLAC__SSE2_SUPPORTED 1
-  #if (_MSC_VER >= 1500) /* MS Visual Studio 2008 */
-    #define FLAC__SSSE3_SUPPORTED 1
-    #define FLAC__SSE4_1_SUPPORTED 1
-  #endif
+  #define FLAC__SSSE3_SUPPORTED 1
+  #define FLAC__SSE4_1_SUPPORTED 1
   #if (_MSC_FULL_VER >= 160040219) /* MS Visual Studio 2010 SP1 */
     #define FLAC__AVX_SUPPORTED 1
   #endif
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.