Merge remote-tracking branch 'gperks/master'

Conflicts:
	taglib/asf/asfpicture.cpp
	taglib/it/itproperties.h

diff --cc CMakeLists.txt
index 611e9ec144229db7f66247c7b0e3e7eb2c2abeb2,df14631e2a12bb52e1dc45bac3fafd1d31a581fd..44980f857c46f3e357253437bdfae6e09a66bc9f
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -34,6 -35,11 +35,11 @@@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COM
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
  endif()
 -endif(ENABLE_STATIC_RUNTIME)
+ if (MSVC AND ENABLE_STATIC_RUNTIME)
+   foreach(flag_var CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
+     string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
+   endforeach(flag_var)
++endif()
  
  set(TAGLIB_LIB_MAJOR_VERSION "1")
  set(TAGLIB_LIB_MINOR_VERSION "7")

diff --cc taglib/mod/modproperties.h
index 8bf3ac5ea0ab7cafc96385a0350c1a88c3266d51,bdf1b75201788038be355a8407c0ad8d9799204f..02a1c60654c3a80abeb7054e5be28e93837ed9e6
--- 1/taglib/mod/modproperties.h
--- 2/taglib/mod/modproperties.h
+++ b/taglib/mod/modproperties.h
@@@ -41,7 -41,9 +41,6 @@@ namespace TagLib 
        uint  instrumentCount()  const;
        uchar lengthInPatterns() const;
  
 -#if !defined(_MSC_VER)
--    protected:
 -#endif
        void setChannels(int channels);
  
        void setInstrumentCount(uint sampleCount);

diff --cc taglib/s3m/s3mproperties.h
index 4be1450835a0376b4721c5da9b1fafbcd884ae1f,820623ab65e4c40a1be4ae70bfabc3b548c11350..0c08866873850d56cc90813c3643fa3b302c5677
--- 1/taglib/s3m/s3mproperties.h
--- 2/taglib/s3m/s3mproperties.h
+++ b/taglib/s3m/s3mproperties.h
@@@ -61,7 -61,9 +61,6 @@@ namespace TagLib 
        uchar  tempo()             const;
        uchar  bpmSpeed()          const;
  
 -#if !defined(_MSC_VER)
--    protected:
 -#endif
        void setChannels(int channels);
  
        void setLengthInPatterns (ushort lengthInPatterns);

diff --cc taglib/xm/xmproperties.h
index 97f93111801ff5c4a7fce92c81604a7a5905cc98,7ba193a2ddea252cd3e5a6e073cfac11510ad2b3..1bb89671945588b4e7329e62428006cdc8cb0949
--- 1/taglib/xm/xmproperties.h
--- 2/taglib/xm/xmproperties.h
+++ b/taglib/xm/xmproperties.h
@@@ -54,7 -54,9 +54,6 @@@ namespace TagLib 
        ushort tempo()            const;
        ushort bpmSpeed()         const;
  
 -#if !defined(_MSC_VER)
--    protected:
 -#endif
        void setChannels(int channels);
  
        void setLengthInPatterns(ushort lengthInPatterns);