diff options
| author | John Emmas <johne53@tiscali.co.uk> | 2014-01-14 15:01:13 +0000 |
|---|---|---|
| committer | John Emmas <johne53@tiscali.co.uk> | 2014-01-14 16:47:29 +0000 |
| commit | b3526d855e07a5819fd13842f6159180b9a018e4 (patch) | |
| tree | c7c62ff22ed8bbc068cf16947f1ab04196a2ec84 /libs/ardour | |
| parent | b9390869eaf6f3e987ea3b7820684b70176400e7 (diff) | |
'libs/ardour' - Non-visibility stuff changed for MSVC (mostly alterations to #include paths)
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/ardour/audiofile_tagger.h | 4 | ||||
| -rw-r--r-- | libs/ardour/ardour/msvc_libardour.h | 4 | ||||
| -rw-r--r-- | libs/ardour/ardour/session.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/slave.h | 2 | ||||
| -rw-r--r-- | libs/ardour/audiofile_tagger.cc | 8 |
5 files changed, 11 insertions, 9 deletions
diff --git a/libs/ardour/ardour/audiofile_tagger.h b/libs/ardour/ardour/audiofile_tagger.h index 88789f9036..e2a8bb7235 100644 --- a/libs/ardour/ardour/audiofile_tagger.h +++ b/libs/ardour/ardour/audiofile_tagger.h @@ -24,8 +24,8 @@ #include <string> #include <taglib/tag.h> -#include <taglib/taglib.h> -#include <taglib/xiphcomment.h> +#include <taglib/toolkit/taglib.h> +#include <taglib/ogg/xiphcomment.h> #include "ardour/libardour_visibility.h" diff --git a/libs/ardour/ardour/msvc_libardour.h b/libs/ardour/ardour/msvc_libardour.h index 52aa65d95c..f8edcdd3cb 100644 --- a/libs/ardour/ardour/msvc_libardour.h +++ b/libs/ardour/ardour/msvc_libardour.h @@ -19,7 +19,7 @@ #ifndef __msvc_libardour_h__ #define __msvc_libardour_h__ -#include "ardour/visibility.h" +#include <ardour/libardour_visibility.h> #include <limits.h> #ifndef _MAX_PATH @@ -29,6 +29,8 @@ #define PATH_MAX _MAX_PATH #endif +#define LIBARDOUR_APICALLTYPE __cdecl + namespace ARDOUR { #ifdef __cplusplus diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 7295828d2f..71703b5c36 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -36,7 +36,7 @@ #include <glibmm/threads.h> -#include <ltc.h> +#include "ltc/ltc.h" #include "pbd/error.h" #include "pbd/event_loop.h" diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h index 7e80055f94..58685499e7 100644 --- a/libs/ardour/ardour/slave.h +++ b/libs/ardour/ardour/slave.h @@ -25,7 +25,7 @@ #include <glibmm/threads.h> #include <jack/jack.h> -#include <ltc.h> +#include <ltc/ltc.h> #include "pbd/signals.h" diff --git a/libs/ardour/audiofile_tagger.cc b/libs/ardour/audiofile_tagger.cc index 61a05d49ce..887366283c 100644 --- a/libs/ardour/audiofile_tagger.cc +++ b/libs/ardour/audiofile_tagger.cc @@ -25,11 +25,11 @@ #include "pbd/convert.h" #include <taglib/fileref.h> -#include <taglib/flacfile.h> -#include <taglib/oggfile.h> +#include <taglib/flac/flacfile.h> +#include <taglib/ogg/oggfile.h> #include <taglib/tag.h> -#include <taglib/taglib.h> -#include <taglib/xiphcomment.h> +#include <taglib/toolkit/taglib.h> +#include <taglib/ogg/xiphcomment.h> /* Convert string to TagLib::String */ #define TL_STR(string) TagLib::String ((string).c_str(), TagLib::String::UTF8) |