From: Lukáš Lalinský <lalinsky@gmail.com>
Date: Thu, 28 Jul 2011 17:03:46 +0000 (+0200)
Subject: Merge remote-tracking branch 'gperks/master'
X-Git-Tag: v1.8beta~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0730076a0f15e802f5fb1168fc127b1092b4b5df;p=taglib

Merge remote-tracking branch 'gperks/master'

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

0730076a0f15e802f5fb1168fc127b1092b4b5df
diff --cc CMakeLists.txt
index 611e9ec1,df14631e..44980f85
--- a/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()
+ 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(ENABLE_STATIC_RUNTIME)
++endif()
  
  set(TAGLIB_LIB_MAJOR_VERSION "1")
  set(TAGLIB_LIB_MINOR_VERSION "7")
diff --cc taglib/mod/modproperties.h
index 8bf3ac5e,bdf1b752..02a1c606
--- a/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 4be14508,820623ab..0c088668
--- a/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 97f93111,7ba193a2..1bb89671
--- a/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);