diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/JavaScriptCore/API/JSBase.h | 2 | ||||
| -rw-r--r-- | Source/JavaScriptCore/ChangeLog | 13 | ||||
| -rw-r--r-- | Source/JavaScriptCore/runtime/JSExportMacros.h | 4 | ||||
| -rw-r--r-- | Source/JavaScriptCore/wscript | 2 | ||||
| -rw-r--r-- | Source/WTF/ChangeLog | 15 | ||||
| -rw-r--r-- | Source/WTF/wtf/ExportMacros.h | 6 | ||||
| -rw-r--r-- | Source/WebCore/ChangeLog | 9 | ||||
| -rw-r--r-- | Source/WebCore/platform/PlatformExportMacros.h | 6 |
8 files changed, 48 insertions, 9 deletions
diff --git a/Source/JavaScriptCore/API/JSBase.h b/Source/JavaScriptCore/API/JSBase.h index fed54fe23..f46a41755 100644 --- a/Source/JavaScriptCore/API/JSBase.h +++ b/Source/JavaScriptCore/API/JSBase.h @@ -71,7 +71,7 @@ typedef struct OpaqueJSValue* JSObjectRef; #elif defined(__GNUC__) && !defined(__CC_ARM) && !defined(__ARMCC__) #define JS_EXPORT __attribute__((visibility("default"))) #elif defined(WIN32) || defined(_WIN32) || defined(_WIN32_WCE) || defined(__CC_ARM) || defined(__ARMCC__) -#if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF) +#if defined(BUILDING_JavaScriptCore) || defined(STATICALLY_LINKED_WITH_JavaScriptCore) #define JS_EXPORT __declspec(dllexport) #else #define JS_EXPORT __declspec(dllimport) diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog index 0251bd405..3907efc13 100644 --- a/Source/JavaScriptCore/ChangeLog +++ b/Source/JavaScriptCore/ChangeLog @@ -1,3 +1,16 @@ +2012-06-19 Joel Dillon <joel.dillon@codethink.co.uk> Jocelyn Turcotte <jocelyn.turcotte@nokia.com> + + [Qt][Win] Fix broken QtWebKit5.lib linking + https://bugs.webkit.org/show_bug.cgi?id=88321 + + Reviewed by NOBODY (OOPS!). + + Also update the Wx build to use the new define. + + * API/JSBase.h: + * runtime/JSExportMacros.h: + * wscript: + 2012-06-13 Patrick Gansterer <paroga@webkit.org> [WIN] Remove dependency on pthread from MachineStackMarker diff --git a/Source/JavaScriptCore/runtime/JSExportMacros.h b/Source/JavaScriptCore/runtime/JSExportMacros.h index 884805f86..19e2c286f 100644 --- a/Source/JavaScriptCore/runtime/JSExportMacros.h +++ b/Source/JavaScriptCore/runtime/JSExportMacros.h @@ -36,7 +36,7 @@ // See note in wtf/Platform.h for more info on EXPORT_MACROS. #if USE(EXPORT_MACROS) -#if defined(BUILDING_JavaScriptCore) +#if defined(BUILDING_JavaScriptCore) || defined(STATICALLY_LINKED_WITH_JavaScriptCore) #define JS_EXPORT_PRIVATE WTF_EXPORT #else #define JS_EXPORT_PRIVATE WTF_IMPORT @@ -50,7 +50,7 @@ #if !PLATFORM(CHROMIUM) && OS(WINDOWS) && !defined(BUILDING_WX__) && !COMPILER(GCC) -#if defined(BUILDING_JavaScriptCore) +#if defined(BUILDING_JavaScriptCore) || defined(STATICALLY_LINKED_WITH_JavaScriptCore) #define JS_EXPORTDATA __declspec(dllexport) #else #define JS_EXPORTDATA __declspec(dllimport) diff --git a/Source/JavaScriptCore/wscript b/Source/JavaScriptCore/wscript index 4afb4d26a..58696d9c5 100644 --- a/Source/JavaScriptCore/wscript +++ b/Source/JavaScriptCore/wscript @@ -66,7 +66,7 @@ def build(bld): features = 'cc cxx cshlib', includes = '. .. assembler ../WTF ' + ' '.join(includes), source = sources, - defines = ['BUILDING_JavaScriptCore'], + defines = ['BUILDING_JavaScriptCore', 'STATICALLY_LINKED_WITH_WTF'], target = 'jscore', uselib = 'WX ICU ' + get_config(), uselib_local = '', diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog index 175633a66..b01ed25bb 100644 --- a/Source/WTF/ChangeLog +++ b/Source/WTF/ChangeLog @@ -1,3 +1,18 @@ +2012-06-19 Joel Dillon <joel.dillon@codethink.co.uk> Jocelyn Turcotte <jocelyn.turcotte@nokia.com> + + [Qt][Win] Fix broken QtWebKit5.lib linking + https://bugs.webkit.org/show_bug.cgi?id=88321 + + Reviewed by NOBODY (OOPS!). + + Instead of letting a module's headers know which other modules depend on them, + have depending modules define explicitely that they want its symbols exported too. + + JavaScriptCore should then be compiled with both BUILDING_JavaScriptCore and + STATICALLY_LINKED_WITH_WTF. + + * wtf/ExportMacros.h: + 2012-06-17 Filip Pizlo <fpizlo@apple.com> It should be possible to look at disassembly diff --git a/Source/WTF/wtf/ExportMacros.h b/Source/WTF/wtf/ExportMacros.h index efa0c8f81..d50d6d117 100644 --- a/Source/WTF/wtf/ExportMacros.h +++ b/Source/WTF/wtf/ExportMacros.h @@ -72,7 +72,7 @@ // FIXME: When all ports are using the export macros, we should replace // WTF_EXPORTDATA with WTF_EXPORT_PRIVATE macros. -#if defined(BUILDING_WTF) || defined(BUILDING_JavaScriptCore) +#if defined(BUILDING_WTF) || defined(STATICALLY_LINKED_WITH_WTF) #define WTF_EXPORTDATA WTF_EXPORT #else #define WTF_EXPORTDATA WTF_IMPORT @@ -81,7 +81,7 @@ #else // !USE(EXPORT_MACROS) #if !PLATFORM(CHROMIUM) && OS(WINDOWS) && !COMPILER(GCC) -#if defined(BUILDING_WTF) || defined(BUILDING_JavaScriptCore) +#if defined(BUILDING_WTF) || defined(STATICALLY_LINKED_WITH_WTF) #define WTF_EXPORTDATA __declspec(dllexport) #else #define WTF_EXPORTDATA __declspec(dllimport) @@ -98,7 +98,7 @@ #endif // USE(EXPORT_MACROS) -#if defined(BUILDING_WTF) || defined(BUILDING_JavaScriptCore) +#if defined(BUILDING_WTF) || defined(STATICALLY_LINKED_WITH_WTF) #define WTF_EXPORT_PRIVATE WTF_EXPORT #else #define WTF_EXPORT_PRIVATE WTF_IMPORT diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 1dd0ef827..9d9649377 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,12 @@ +2012-06-19 Joel Dillon <joel.dillon@codethink.co.uk> Jocelyn Turcotte <jocelyn.turcotte@nokia.com> + + [Qt][Win] Fix broken QtWebKit5.lib linking + https://bugs.webkit.org/show_bug.cgi?id=88321 + + Reviewed by NOBODY (OOPS!). + + * platform/PlatformExportMacros.h: + 2012-06-19 Vivek Galatage <vivekgalatage@gmail.com> Web Inspector: Clicking "Clear all profiles" while ongoing recording should reset the ProfileLauncherView diff --git a/Source/WebCore/platform/PlatformExportMacros.h b/Source/WebCore/platform/PlatformExportMacros.h index 6c70813ad..ae3e30a3a 100644 --- a/Source/WebCore/platform/PlatformExportMacros.h +++ b/Source/WebCore/platform/PlatformExportMacros.h @@ -35,7 +35,8 @@ // See note in wtf/Platform.h for more info on EXPORT_MACROS. #if USE(EXPORT_MACROS) -#if defined(BUILDING_WebCore) || defined(BUILDING_WebKit) +#if defined(BUILDING_WebCore) || defined(BUILDING_WebKit) || \ + defined(STATICALLY_LINKED_WITH_WebCore) || defined(STATICALLY_LINKED_WITH_WebKit) #define WEBKIT_EXPORTDATA WTF_EXPORT #else #define WEBKIT_EXPORTDATA WTF_IMPORT @@ -45,7 +46,8 @@ #if !PLATFORM(CHROMIUM) && OS(WINDOWS) && !defined(BUILDING_WX__) && !COMPILER(GCC) -#if defined(BUILDING_WebCore) || defined(BUILDING_WebKit) +#if defined(BUILDING_WebCore) || defined(BUILDING_WebKit) || \ + defined(STATICALLY_LINKED_WITH_WebCore) || defined(STATICALLY_LINKED_WITH_WebKit) #define WEBKIT_EXPORTDATA __declspec(dllexport) #else #define WEBKIT_EXPORTDATA __declspec(dllimport) |