diff options
author | Memphiz <memphis@machzwo.de> | 2015-04-11 22:11:00 +0200 |
---|---|---|
committer | Memphiz <memphis@machzwo.de> | 2015-04-11 22:11:00 +0200 |
commit | 2dd0e8f042839a5a70f37381e585c878a415311f (patch) | |
tree | 3074469a67200b523ebe0a60c2015946202c22a6 | |
parent | f7733e55b43bdabc0d444f65a01ecce59157653f (diff) | |
parent | 870caca29c51c5cbb8695ab9996083f262c93eb4 (diff) |
Merge pull request #6925 from Memphiz/xcode63
[darwin] - fix compile with xcode 6.3
-rw-r--r-- | docs/README.ios | 1 | ||||
-rw-r--r-- | docs/README.osx | 2 | ||||
-rw-r--r-- | tools/depends/target/libffi/Makefile | 2 | ||||
-rw-r--r-- | tools/depends/target/nettle/01-disable_testsuite.patch | 11 | ||||
-rw-r--r-- | tools/depends/target/nettle/Makefile | 1 | ||||
-rw-r--r-- | xbmc/guilib/GUIFontCache.cpp | 7 |
6 files changed, 23 insertions, 1 deletions
diff --git a/docs/README.ios b/docs/README.ios index c0ea872169..f8609c57b5 100644 --- a/docs/README.ios +++ b/docs/README.ios @@ -67,6 +67,7 @@ constellations of Xcode and osx versions (to be updated once we know more): 1. Xcode 6.0.1 against iOS SDK 8.0 on 10.9.x (Mavericks) 2. Xcode 6.1.0 against iOS SDK 8.1 on 10.10.x (Yosemite) +3. Xcode 6.3.0 against iOS SDK 8.3 on 10.10.x (Yosemite) ----------------------------------------------------------------------------- 3.2 Install Cross libs and runtime environment diff --git a/docs/README.osx b/docs/README.osx index a42c435191..c6570f249d 100644 --- a/docs/README.osx +++ b/docs/README.osx @@ -64,6 +64,8 @@ constellations of Xcode and osx versions (to be updated once we know more): 1. XCode 6.0.1 against OSX SDK 10.9 (M) 2. XCode 6.1.0 against OSX SDK 10.10 (Y) +3. XCode 6.2.0 against OSX SDK 10.10 (Y) +4. XCode 6.3.0 against OSX SDK 10.10 (Y) ----------------------------------------------------------------------------- 3.2 Install Kodi build depends diff --git a/tools/depends/target/libffi/Makefile b/tools/depends/target/libffi/Makefile index 3a4ed476a3..fa4ee815bf 100644 --- a/tools/depends/target/libffi/Makefile +++ b/tools/depends/target/libffi/Makefile @@ -10,7 +10,7 @@ ARCHIVE=$(SOURCE).tar.gz # configuration settings CONFIGURE= ./configure --prefix=$(PREFIX) --disable-shared --disable-builddir ifeq ($(OS), ios) -CONFIGURE+=CFLAGS=-no-integrated-as +CONFIGURE+=CCASFLAGS=-no-integrated-as endif diff --git a/tools/depends/target/nettle/01-disable_testsuite.patch b/tools/depends/target/nettle/01-disable_testsuite.patch new file mode 100644 index 0000000000..97b1d47f97 --- /dev/null +++ b/tools/depends/target/nettle/01-disable_testsuite.patch @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2015-04-11 15:11:40.000000000 +0200 ++++ Makefile.in 2015-04-11 15:11:47.000000000 +0200 +@@ -16,7 +16,7 @@ + + OPT_ASM_SOURCES = @OPT_ASM_SOURCES@ + +-SUBDIRS = tools testsuite examples ++SUBDIRS = tools examples + + include config.make + diff --git a/tools/depends/target/nettle/Makefile b/tools/depends/target/nettle/Makefile index df823eacf2..ff6e12023e 100644 --- a/tools/depends/target/nettle/Makefile +++ b/tools/depends/target/nettle/Makefile @@ -29,6 +29,7 @@ $(TARBALLS_LOCATION)/$(ARCHIVE): $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) + cd $(PLATFORM); patch -p0 < ../01-disable_testsuite.patch cd $(PLATFORM); $(CONFIGURE) $(LIBDYLIB): $(PLATFORM) diff --git a/xbmc/guilib/GUIFontCache.cpp b/xbmc/guilib/GUIFontCache.cpp index 1359b2ba2c..33e1d0076d 100644 --- a/xbmc/guilib/GUIFontCache.cpp +++ b/xbmc/guilib/GUIFontCache.cpp @@ -23,6 +23,13 @@ #include "GUIFontTTF.h" #include "GraphicContext.h" +#if defined(TARGET_DARWIN ) +// apple clang with c++11 doesn't like +// the forwards declarations of boost +// disable them ... +#define BOOST_DETAIL_NO_CONTAINER_FWD 1 +#endif + #include "boost/multi_index_container.hpp" #include "boost/multi_index/sequenced_index.hpp" #include "boost/multi_index/hashed_index.hpp" |