diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-24 16:36:50 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-24 16:36:50 +0100 |
| commit | ad0d549d4cc13433f77c1ac8f0ab379c83d93f28 (patch) | |
| tree | b34b0daceb7c8e7fdde4b4ec43650ab7caadb0a9 /Source/ThirdParty | |
| parent | 03e12282df9aa1e1fb05a8b90f1cfc2e08764cec (diff) | |
| download | qtwebkit-ad0d549d4cc13433f77c1ac8f0ab379c83d93f28.tar.gz | |
Imported WebKit commit bb52bf3c0119e8a128cd93afe5572413a8617de9 (http://svn.webkit.org/repository/webkit/trunk@108790)
Diffstat (limited to 'Source/ThirdParty')
| -rw-r--r-- | Source/ThirdParty/ANGLE/ChangeLog | 15 | ||||
| -rw-r--r-- | Source/ThirdParty/ANGLE/Configurations/Base.xcconfig | 5 | ||||
| -rw-r--r-- | Source/ThirdParty/ChangeLog | 18 | ||||
| -rw-r--r-- | Source/ThirdParty/gtest/xcode/Config/General.xcconfig | 8 |
4 files changed, 46 insertions, 0 deletions
diff --git a/Source/ThirdParty/ANGLE/ChangeLog b/Source/ThirdParty/ANGLE/ChangeLog index 109efc7c3..db1a8388b 100644 --- a/Source/ThirdParty/ANGLE/ChangeLog +++ b/Source/ThirdParty/ANGLE/ChangeLog @@ -1,3 +1,18 @@ +2012-02-21 Sam Weinig <sam@webkit.org> + + Attempt to fix the Snow Leopard build. + + * Configurations/Base.xcconfig: + +2012-02-21 Sam Weinig <sam@webkit.org> + + Use libc++ when building with Clang on Mac + https://bugs.webkit.org/show_bug.cgi?id=78981 + + Reviewed by Dan Bernstein. + + * Configurations/Base.xcconfig: + 2012-01-07 Chris Marrin <cmarrin@apple.com> Fixed a warning in GTK build of ANGLE diff --git a/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig b/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig index 4a84fb355..42134ba3a 100644 --- a/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig +++ b/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig @@ -24,6 +24,11 @@ LINKER_DISPLAYS_MANGLED_NAMES = YES; PREBINDING = NO; STRIP_INSTALLED_PRODUCT = NO; +CLANG_CXX_LIBRARY = $(CLANG_CXX_LIBRARY_$(TARGET_MAC_OS_X_VERSION_MAJOR)); +CLANG_CXX_LIBRARY_1060 = libstdc++; +CLANG_CXX_LIBRARY_1070 = libc++; +CLANG_CXX_LIBRARY_1080 = libc++; +CLANG_CXX_LIBRARY_1090 = libc++; REAL_PLATFORM_NAME = $(REAL_PLATFORM_NAME_$(PLATFORM_NAME)); REAL_PLATFORM_NAME_ = $(REAL_PLATFORM_NAME_macosx); diff --git a/Source/ThirdParty/ChangeLog b/Source/ThirdParty/ChangeLog index 02381969c..3e2010833 100644 --- a/Source/ThirdParty/ChangeLog +++ b/Source/ThirdParty/ChangeLog @@ -1,3 +1,21 @@ +2012-02-21 Sam Weinig <sam@webkit.org> + + Attempt to fix the Snow Leopard build. + + * gtest/xcode/Config/General.xcconfig: + +2012-02-21 Sam Weinig <sam@webkit.org> + + Use libc++ when building with Clang on Mac + https://bugs.webkit.org/show_bug.cgi?id=78981 + + Reviewed by Dan Bernstein. + + * gtest/xcode/Config/General.xcconfig: + In addition to enabling libc++ when building with Clang, + disable gtest's use of tr1::tuple, which doesn't exist in + libc++. + 2012-01-25 Mark Rowe <mrowe@apple.com> Build in to an alternate location when USE_STAGING_INSTALL_PATH is set. diff --git a/Source/ThirdParty/gtest/xcode/Config/General.xcconfig b/Source/ThirdParty/gtest/xcode/Config/General.xcconfig index 50b7c2cb8..93307b687 100644 --- a/Source/ThirdParty/gtest/xcode/Config/General.xcconfig +++ b/Source/ThirdParty/gtest/xcode/Config/General.xcconfig @@ -36,6 +36,14 @@ ALWAYS_SEARCH_USER_PATHS = NO // Turn on position dependent code for most cases (overridden where appropriate) GCC_DYNAMIC_NO_PIC = YES +GCC_PREPROCESSOR_DEFINITIONS = $(GCC_PREPROCESSOR_DEFINITIONS) GTEST_HAS_TR1_TUPLE=0; + +CLANG_CXX_LIBRARY = $(CLANG_CXX_LIBRARY_$(TARGET_MAC_OS_X_VERSION_MAJOR)); +CLANG_CXX_LIBRARY_1060 = libstdc++; +CLANG_CXX_LIBRARY_1070 = libc++; +CLANG_CXX_LIBRARY_1080 = libc++; +CLANG_CXX_LIBRARY_1090 = libc++; + REAL_PLATFORM_NAME = $(REAL_PLATFORM_NAME_$(PLATFORM_NAME)); REAL_PLATFORM_NAME_ = $(REAL_PLATFORM_NAME_macosx); REAL_PLATFORM_NAME_iphoneos = iphoneos; |