v1.6 RC1 on Win64

[NightStrike]

2009/9/3 Lukáš Lalinský <lalinsky at gmail.com>:
> 2009/9/3 NightStrike <nightstrike at gmail.com>:
>> 2009/9/3 Lukáš Lalinský <lalinsky at gmail.com>:
>>> On Thu, Sep 3, 2009 at 11:22 PM, NightStrike<nightstrike at gmail.com> wrote:
>>>> Taglib is currently used by VLC, and VLC requires Win64 support in
>>>> Taglib to have a win64 supported VLC.  1.5 works for this, but 1.6
>>>> seems to break this compatibility.
>>>>
>>>> I tried to compile your release candidate for Win64 using
>>>> http://mingw-w64.sf.net/ , and it died as follows:
>>>>
>>>> tstring.cpp:74:16: error: definition of static data member
>>>> 'TagLib::String::null' of dllimport'd class
>>>
>>> How are you building TagLib? tstring.cpp should see only dllexported
>>> TagLib::String, never dllimported.
>>
>> ./configure --target=x86_64-w64-mingw32 --host=x86_64-w64-mingw32
>> --build=x86_64-linux-gnu --program-prefix= --without-pic
>> --disable-shared --enable-msw --disable-dependency-tracking
>> --prefix=/home/nightstrike/work/vlc/extras/contrib
>
> The autotools-based build system doesn't support compilation on
> Windows (and neither it did in 1.5). This is possible to fix, but I
> didn't know anybody would like to use that. All that is necessary is
> to define MAKE_TAGLIB_LIB.
>
> --
> Lukas Lalinsky
> lalinsky at gmail.com
>

diff -ru taglib-1.6rc1/configure.in taglib-1.6rc1.new/configure.in
--- taglib-1.6rc1/configure.in	2009-09-03 21:19:26.000000000 +0200
+++ taglib-1.6rc1.new/configure.in	2009-09-04 00:00:06.000000000 +0200
@@ -37,7 +37,11 @@
 unset CDPATH

 dnl Checking host/target/build systems, for make, install etc.
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
+
+AS_CASE([$host_os],
+  [mingw*],[AC_DEFINE([MAKE_TAGLIB_LIB],[],[Enable support for windows])])
+
 dnl Perform program name transformation
 AC_ARG_PROGRAM

diff -ru taglib-1.6rc1/taglib/toolkit/tbytevector.cpp
taglib-1.6rc1.new/taglib/toolkit/tbytevector.cpp
--- taglib-1.6rc1/taglib/toolkit/tbytevector.cpp	2008-12-04
13:37:36.000000000 +0100
+++ taglib-1.6rc1.new/taglib/toolkit/tbytevector.cpp	2009-09-04
00:05:37.000000000 +0200
@@ -22,7 +22,7 @@
  *   License Version 1.1.  You may obtain a copy of the License at         *
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
-
+#include <config.h>
 #include <iostream>

 #include <tstring.h>
diff -ru taglib-1.6rc1/taglib/toolkit/tstring.cpp
taglib-1.6rc1.new/taglib/toolkit/tstring.cpp
--- taglib-1.6rc1/taglib/toolkit/tstring.cpp	2009-04-29 17:57:05.000000000 +0200
+++ taglib-1.6rc1.new/taglib/toolkit/tstring.cpp	2009-09-04
00:05:05.000000000 +0200
@@ -22,7 +22,7 @@
  *   License Version 1.1.  You may obtain a copy of the License at         *
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
-
+#include <config.h>
 #include "tstring.h"
 #include "unicode.h"
 #include "tdebug.h"