diff options
| author | Misty De Meo <mistydemeo@gmail.com> | 2013-01-10 12:21:15 -0600 |
|---|---|---|
| committer | Hubert Figuière <hub@figuiere.net> | 2013-01-15 12:19:45 -0500 |
| commit | 6c1a7111fd98f03559abe1883b5e25c289e56ca0 (patch) | |
| tree | d55509a6410663d82d6f08292b7fc4386e8e9b21 | |
| parent | 720fdbc86b625a45dd28226f829be0764b8ebc58 (diff) | |
Bug 58175 - Replace OS X FlatCarbon headers
Several files were including FlatCarbon headers with a hardcoded
include path. Unfortunately, this path is no longer valid as of recent
Xcode versions.
Fortunately, the FlatCarbon headers are just shims for the real
includes, and all of the includes exempi uses come from CoreServices.
Replacing the specific includes with the generic CoreServices header
is a more compatible solution.
Signed-off-by: Hubert Figuière <hub@figuiere.net>
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | source/XMPFiles/FormatSupport/QuickTime_Support.cpp | 2 | ||||
| -rw-r--r-- | source/XMPFiles/FormatSupport/Reconcile_Impl.cpp | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 37a7864..3bf8a6c 100644 --- a/configure.ac +++ b/configure.ac @@ -172,7 +172,6 @@ fi case $build_vendor in apple) EXEMPI_PLATFORM_DEF=MAC_ENV - CPPFLAGS="$CPPFLAGS -I/Developer/Headers/FlatCarbon" LDFLAGS="$LDFLAGS -framework CoreServices" ;; *) diff --git a/source/XMPFiles/FormatSupport/QuickTime_Support.cpp b/source/XMPFiles/FormatSupport/QuickTime_Support.cpp index 31091ea..9eb2e15 100644 --- a/source/XMPFiles/FormatSupport/QuickTime_Support.cpp +++ b/source/XMPFiles/FormatSupport/QuickTime_Support.cpp @@ -10,7 +10,7 @@ #include "XMP_Environment.h" #if XMP_MacBuild - #include "Script.h" + #include <CoreServices/CoreServices.h> #else #include "MacScriptExtracts.h" #endif diff --git a/source/XMPFiles/FormatSupport/Reconcile_Impl.cpp b/source/XMPFiles/FormatSupport/Reconcile_Impl.cpp index 7d27769..e5dcedc 100644 --- a/source/XMPFiles/FormatSupport/Reconcile_Impl.cpp +++ b/source/XMPFiles/FormatSupport/Reconcile_Impl.cpp @@ -15,7 +15,7 @@ #if XMP_WinBuild #elif XMP_MacBuild - #include "UnicodeConverter.h" + #include <CoreServices/CoreServices.h> #endif // ================================================================================================= |