Removed config.h and moved macros into taglib_config.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 14f0095611714c27dcbebf1cd1350e406999a85e..efbb3efb1e2d30f3a9b18f61653f40d80a2c3b27 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,13 +81,12 @@ if(NOT WIN32 AND NOT BUILD_FRAMEWORK)
 endif()
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
-configure_file(config-taglib.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 
 if(WITH_ASF)
-    set(TAGLIB_WITH_ASF TRUE)
+  set(TAGLIB_WITH_ASF TRUE)
 endif()
 if(WITH_MP4)
-    set(TAGLIB_WITH_MP4 TRUE)
+  set(TAGLIB_WITH_MP4 TRUE)
 endif()
 
 configure_file(taglib/taglib_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib_config.h)

diff --git a/bindings/c/tag_c.cpp b/bindings/c/tag_c.cpp
index b1af613cf2832f6dd106a24e980e2317d1580e39..5b739d6f452155bc7919fc6eac2f6da847e7a6ee 100644 (file)
--- a/bindings/c/tag_c.cpp
+++ b/bindings/c/tag_c.cpp
@@ -19,10 +19,7 @@
  *   USA                                                                   *
  ***************************************************************************/
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
+#include "taglib_config.h"
 #include <stdlib.h>
 #include <fileref.h>
 #include <tfile.h>

diff --git a/config-taglib.h.cmake b/config-taglib.h.cmake
deleted file mode 100644 (file)
index aee25a7..0000000
--- a/config-taglib.h.cmake
+++ /dev/null
@@ -1,43 +0,0 @@
-/* config-taglib.h. Generated by cmake from config-taglib.h.cmake */
-
-/* Indicates the endianness of your target system */
-#cmakedefine   TAGLIB_LITTLE_ENDIAN 1
-#cmakedefine   TAGLIB_BIG_ENDIAN 1
-
-/* Size of integral types */
-#cmakedefine   SIZEOF_SHORT    ${SIZEOF_SHORT}
-#cmakedefine   SIZEOF_INT      ${SIZEOF_INT}
-#cmakedefine   SIZEOF_LONGLONG ${SIZEOF_LONGLONG}
-#cmakedefine   SIZEOF_WCHAR_T  ${SIZEOF_WCHAR_T}
-
-/* Defined if your compiler supports std::wstring */
-#cmakedefine   HAVE_STD_WSTRING 1
-
-/* Defined if your compiler supports some atomic operations */
-#cmakedefine   HAVE_STD_ATOMIC 1
-#cmakedefine   HAVE_BOOST_ATOMIC 1
-#cmakedefine   HAVE_GCC_ATOMIC 1
-#cmakedefine   HAVE_MAC_ATOMIC 1
-#cmakedefine   HAVE_WIN_ATOMIC 1
-#cmakedefine   HAVE_IA64_ATOMIC 1
-
-/* Defined if your compiler supports some byte swap functions */
-#cmakedefine   HAVE_GCC_BYTESWAP_16 1
-#cmakedefine   HAVE_GCC_BYTESWAP_32 1
-#cmakedefine   HAVE_GCC_BYTESWAP_64 1
-#cmakedefine   HAVE_GLIBC_BYTESWAP 1
-#cmakedefine   HAVE_MSC_BYTESWAP 1
-#cmakedefine   HAVE_MAC_BYTESWAP 1
-#cmakedefine   HAVE_OPENBSD_BYTESWAP 1
-
-/* Defined if your compiler supports codecvt */
-#cmakedefine   HAVE_STD_CODECVT 1
-
-/* Defined if you have libz */
-#cmakedefine   HAVE_ZLIB 1
-
-#cmakedefine   NO_ITUNES_HACKS 1
-#cmakedefine   WITH_ASF 1
-#cmakedefine   WITH_MP4 1
-
-#cmakedefine TESTS_DIR "@TESTS_DIR@"

diff --git a/taglib/asf/asfproperties.cpp b/taglib/asf/asfproperties.cpp
index 11d43b9d9e4328e8604b37149de3f0a1d0804421..638baf6ea2edb6e1c602416dd0a7139c29b2484b 100644 (file)
--- a/taglib/asf/asfproperties.cpp
+++ b/taglib/asf/asfproperties.cpp
@@ -23,8 +23,7 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include "config.h"
-
+#include "taglib_config.h"
 #include <tdebug.h>
 #include <tstring.h>
 #include "asfproperties.h"

diff --git a/taglib/asf/asftag.cpp b/taglib/asf/asftag.cpp
index 70881209e7d1bd4d18bd01e538930cd7b19d8d26..0767817fd4299f593488f3f34c491e848bbccd2b 100644 (file)
--- a/taglib/asf/asftag.cpp
+++ b/taglib/asf/asftag.cpp
@@ -23,8 +23,7 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include "config.h"
-
+#include "taglib_config.h"
 #include <tpropertymap.h>
 #include "asftag.h"
 

diff --git a/taglib/fileref.cpp b/taglib/fileref.cpp
index 6da560b704cdb1ffd2ed47646402f6f442789021..508fc0c5fef8307c406e048a5617c402df4cfc4a 100644 (file)
--- a/taglib/fileref.cpp
+++ b/taglib/fileref.cpp
@@ -27,7 +27,7 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <config.h>
+#include "taglib_config.h"
 
 #ifdef _WIN32
 # include <Shlwapi.h>

diff --git a/taglib/mp4/mp4properties.cpp b/taglib/mp4/mp4properties.cpp
index f5d7ed21be4d618ae72eea845d45a5d29b4763cf..d704b452def4f3a78eb9fb4d6687a027684414ea 100644 (file)
--- a/taglib/mp4/mp4properties.cpp
+++ b/taglib/mp4/mp4properties.cpp
@@ -23,8 +23,7 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include "config.h"
-
+#include "taglib_config.h"
 #include <tdebug.h>
 #include <tstring.h>
 #include "mp4file.h"

diff --git a/taglib/mp4/mp4tag.cpp b/taglib/mp4/mp4tag.cpp
index e16a994b704df7e1f3bce53f11510cf8b95cbc9a..1edeace7fdae0b9390a6aae73982825d1179d2fb 100644 (file)
--- a/taglib/mp4/mp4tag.cpp
+++ b/taglib/mp4/mp4tag.cpp
@@ -23,8 +23,7 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include "config.h"
-
+#include "taglib_config.h"
 #include <tdebug.h>
 #include <tstring.h>
 #include <tpropertymap.h>

diff --git a/taglib/mpeg/id3v2/id3v2frame.cpp b/taglib/mpeg/id3v2/id3v2frame.cpp
index a444b9eb5a5221470e3d630e84c7572f77e9ca91..6333f9d9995cfbee02beb82a72cb485eaecf561e 100644 (file)
--- a/taglib/mpeg/id3v2/id3v2frame.cpp
+++ b/taglib/mpeg/id3v2/id3v2frame.cpp
@@ -23,7 +23,7 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include "config.h"
+#include "taglib_config.h"
 
 #if HAVE_ZLIB
 #include <zlib.h>

diff --git a/taglib/mpeg/id3v2/id3v2framefactory.cpp b/taglib/mpeg/id3v2/id3v2framefactory.cpp
index 54b37ce80d8b9ac8f4facf1b7689990be8d026df..5c223e1a4fcfa7c2564cbe7f9c3615ed619cd84c 100644 (file)
--- a/taglib/mpeg/id3v2/id3v2framefactory.cpp
+++ b/taglib/mpeg/id3v2/id3v2framefactory.cpp
@@ -23,8 +23,7 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include "config.h"
-
+#include "taglib_config.h"
 #include <tdebug.h>
 
 #include "id3v2framefactory.h"

diff --git a/taglib/taglib_config.h.cmake b/taglib/taglib_config.h.cmake
index 0f499e2c2de7d6a7f9de18c3ff5570c4c487d8d7..c97e6b6b61567a7f231a8dfc517aa3fb7d1554b6 100644 (file)
--- a/taglib/taglib_config.h.cmake
+++ b/taglib/taglib_config.h.cmake
@@ -1,4 +1,42 @@
 /* taglib_config.h. Generated by cmake from taglib_config.h.cmake */
 
+/* Indicates the endianness of your target system */
+#cmakedefine   TAGLIB_LITTLE_ENDIAN 1
+#cmakedefine   TAGLIB_BIG_ENDIAN 1
+
+/* Size of integral types */
+#cmakedefine   SIZEOF_SHORT    ${SIZEOF_SHORT}
+#cmakedefine   SIZEOF_INT      ${SIZEOF_INT}
+#cmakedefine   SIZEOF_LONGLONG ${SIZEOF_LONGLONG}
+#cmakedefine   SIZEOF_WCHAR_T  ${SIZEOF_WCHAR_T}
+
+/* Defined if your compiler supports std::wstring */
+#cmakedefine   HAVE_STD_WSTRING 1
+
+/* Defined if your compiler supports some atomic operations */
+#cmakedefine   HAVE_STD_ATOMIC 1
+#cmakedefine   HAVE_BOOST_ATOMIC 1
+#cmakedefine   HAVE_GCC_ATOMIC 1
+#cmakedefine   HAVE_MAC_ATOMIC 1
+#cmakedefine   HAVE_WIN_ATOMIC 1
+#cmakedefine   HAVE_IA64_ATOMIC 1
+
+/* Defined if your compiler supports some byte swap functions */
+#cmakedefine   HAVE_GCC_BYTESWAP_16 1
+#cmakedefine   HAVE_GCC_BYTESWAP_32 1
+#cmakedefine   HAVE_GCC_BYTESWAP_64 1
+#cmakedefine   HAVE_GLIBC_BYTESWAP 1
+#cmakedefine   HAVE_MSC_BYTESWAP 1
+#cmakedefine   HAVE_MAC_BYTESWAP 1
+#cmakedefine   HAVE_OPENBSD_BYTESWAP 1
+
+/* Defined if your compiler supports codecvt */
+#cmakedefine   HAVE_STD_CODECVT 1
+
+/* Defined if you have libz */
+#cmakedefine   HAVE_ZLIB 1
+
 #define   TAGLIB_WITH_ASF 1
 #define   TAGLIB_WITH_MP4 1
+
+#cmakedefine TESTS_DIR "@TESTS_DIR@"

diff --git a/taglib/taglib_export.h b/taglib/taglib_export.h
index 3e868551710cf40d9004c3fe036ed8169f1ebf5a..737ae644225ab388257bd3a57129c0733f5406a4 100644 (file)
--- a/taglib/taglib_export.h
+++ b/taglib/taglib_export.h
@@ -40,8 +40,4 @@
 #define TAGLIB_EXPORT
 #endif
 
-#ifndef TAGLIB_NO_CONFIG
-#include "taglib_config.h"
-#endif
-
 #endif

diff --git a/taglib/toolkit/taglib.h b/taglib/toolkit/taglib.h
index bc94aa8803312f2d23d2408ad3348d0addbab418..da725f9788c095c49a16a21ff16f1f091525a351 100755 (executable)
--- a/taglib/toolkit/taglib.h
+++ b/taglib/toolkit/taglib.h
@@ -26,27 +26,12 @@
 #ifndef TAGLIB_H
 #define TAGLIB_H
 
-#include "config.h"
+#include "taglib_config.h"
 
 #define TAGLIB_MAJOR_VERSION 1
 #define TAGLIB_MINOR_VERSION 8
 #define TAGLIB_PATCH_VERSION 0
 
-#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 1))
-#define TAGLIB_IGNORE_MISSING_DESTRUCTOR _Pragma("GCC diagnostic ignored \"-Wnon-virtual-dtor\"")
-#else
-#define TAGLIB_IGNORE_MISSING_DESTRUCTOR
-#endif
-
-#if (defined(_MSC_VER) && _MSC_VER >= 1600)
-#define TAGLIB_CONSTRUCT_BITSET(x) static_cast<unsigned long long>(x)
-#else
-#define TAGLIB_CONSTRUCT_BITSET(x) static_cast<unsigned long>(x)
-#endif
-
-#include <string>
-#include <climits>
-
 // Check the widths of integral types.
 
 #if SIZEOF_SHORT != 2
@@ -65,6 +50,20 @@
 # error TagLib requires that wchar_t is sufficient to store a UTF-16 char.
 #endif
 
+#include <string>
+
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 1))
+#define TAGLIB_IGNORE_MISSING_DESTRUCTOR _Pragma("GCC diagnostic ignored \"-Wnon-virtual-dtor\"")
+#else
+#define TAGLIB_IGNORE_MISSING_DESTRUCTOR
+#endif
+
+#if (defined(_MSC_VER) && _MSC_VER >= 1600)
+#define TAGLIB_CONSTRUCT_BITSET(x) static_cast<unsigned long long>(x)
+#else
+#define TAGLIB_CONSTRUCT_BITSET(x) static_cast<unsigned long>(x)
+#endif
+
 // Atomic increment/decrement operations
 
 #if defined(HAVE_STD_ATOMIC)

diff --git a/tests/test_fileref.cpp b/tests/test_fileref.cpp
index 5500ae7fec297e9f07bbd490715dc8826bb79ef6..06663c97c194d16eb14e0e494c948430ac17f9eb 100644 (file)
--- a/tests/test_fileref.cpp
+++ b/tests/test_fileref.cpp
@@ -6,9 +6,6 @@
 #include <vorbisfile.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include "utils.h"
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 
 using namespace std;
 using namespace TagLib;

diff --git a/tests/utils.h b/tests/utils.h
index b69bfa50657fdc1e90a195d202d092b7baded225..5de051e77dcb03320cc7e05f0efd1bb7a2c3ec12 100644 (file)
--- a/tests/utils.h
+++ b/tests/utils.h
@@ -1,6 +1,5 @@
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "taglib_config.h"
+
 #ifdef _WIN32
 #include <windows.h>
 #else