diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2010-05-14 17:59:46 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2010-05-14 17:59:46 (GMT) |
| commit | 6f45b35ff46fcc339715d0360a9a998e0ef7cb2b (patch) | |
| tree | f482f0f61d65733f3aed489715f9b5b44bb6c781 /src/id3lib-1-win32.patch | |
| parent | 40f4cf1fbfe702ed8fce45868f88f4b52f3ae227 (diff) | |
| download | mxe-6f45b35ff46fcc339715d0360a9a998e0ef7cb2b.zip mxe-6f45b35ff46fcc339715d0360a9a998e0ef7cb2b.tar.gz mxe-6f45b35ff46fcc339715d0360a9a998e0ef7cb2b.tar.bz2 | |
improved naming of patch files
Diffstat (limited to 'src/id3lib-1-win32.patch')
| -rw-r--r-- | src/id3lib-1-win32.patch | 81 |
1 files changed, 81 insertions, 0 deletions
diff --git a/src/id3lib-1-win32.patch b/src/id3lib-1-win32.patch new file mode 100644 index 0000000..7867f2b --- /dev/null +++ b/src/id3lib-1-win32.patch @@ -0,0 +1,81 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +diff -ru id3lib-3.8.3-orig/configure.in id3lib-3.8.3/configure.in +--- id3lib-3.8.3-orig/configure.in 2003-03-02 01:23:00.000000000 +0100 ++++ id3lib-3.8.3/configure.in 2010-01-23 14:15:24.000000000 +0100 +@@ -89,6 +89,8 @@ + + AC_ISC_POSIX + ++AC_CHECK_TOOL([AR], [ar], [:]) ++ + dnl Initialize libtool + AM_PROG_LIBTOOL + +@@ -227,7 +229,6 @@ + ) + AC_CHECK_HEADERS( \ + string \ +- iomanip.h \ + ,,AC_MSG_ERROR([Missing a vital header file for id3lib]) + ) + +@@ -251,7 +252,7 @@ + AC_CHECK_FUNCS(mkstemp) + AC_CHECK_FUNCS( + truncate \ +- ,,AC_MSG_ERROR([Missing a vital function for id3lib]) ++ ,,AC_MSG_WARN([Missing a vital function for id3lib]) + ) + + dnl Checks for typedefs, structures, and compiler characteristics. +diff -ru id3lib-3.8.3-orig/include/id3/globals.h id3lib-3.8.3/include/id3/globals.h +--- id3lib-3.8.3-orig/include/id3/globals.h 2003-03-02 01:23:00.000000000 +0100 ++++ id3lib-3.8.3/include/id3/globals.h 2010-01-23 14:22:58.000000000 +0100 +@@ -41,7 +41,7 @@ + * we prefix variable declarations so they can + * properly get exported in windows dlls. + */ +-#ifdef WIN32 ++#ifdef __MSVC_VER + # define LINKOPTION_STATIC 1 //both for use and creation of static lib + # define LINKOPTION_CREATE_DYNAMIC 2 //should only be used by prj/id3lib.dsp + # define LINKOPTION_USE_DYNAMIC 3 //if your project links id3lib dynamic +@@ -74,11 +74,11 @@ + # define CCONV __stdcall // Added for VB & Delphi Compatibility - By FrogPrince Advised By Lothar + # endif + # endif +-#else /* !WIN32 */ ++#else /* !__MSVC_VER */ + # define ID3_C_EXPORT + # define ID3_CPP_EXPORT + # define CCONV +-#endif /* !WIN32 */ ++#endif /* !__MSVC_VER */ + + #define ID3_C_VAR extern + +diff -ru id3lib-3.8.3-orig/include/id3/id3lib_strings.h id3lib-3.8.3/include/id3/id3lib_strings.h +--- id3lib-3.8.3-orig/include/id3/id3lib_strings.h 2003-03-02 01:23:00.000000000 +0100 ++++ id3lib-3.8.3/include/id3/id3lib_strings.h 2010-01-23 14:15:24.000000000 +0100 +@@ -30,6 +30,7 @@ + #define _ID3LIB_STRINGS_H_ + + #include <string> ++#include <cstring> + + #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000)) + namespace std +diff -ru id3lib-3.8.3-orig/include/id3/writers.h id3lib-3.8.3/include/id3/writers.h +--- id3lib-3.8.3-orig/include/id3/writers.h 2003-03-02 01:23:00.000000000 +0100 ++++ id3lib-3.8.3/include/id3/writers.h 2010-01-23 14:15:24.000000000 +0100 +@@ -30,7 +30,7 @@ + + #include "id3/writer.h" + #include "id3/id3lib_streams.h" +-//#include <string.h> ++#include <cstring> + + class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer + { |