Changeset 259043 in webkit for trunk/Source/JavaScriptCore/shell

Timestamp:

Mar 26, 2020, 7:31:28 AM (5 years ago)

Author:

[email protected]

Message:

Unreviewed, reverting r259035.
​https://bugs.webkit.org/show_bug.cgi?id=209597

broke windows layout-tests (Requested by aakashjain on
#webkit).

Reverted changeset:

"[Win] lld-link: error: /manifestdependency: is not allowed in
.drectve"
​https://bugs.webkit.org/show_bug.cgi?id=204831
​https://trac.webkit.org/changeset/259035

File:

• trunk/Source/JavaScriptCore/shell/DLLLauncherMain.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/shell/DLLLauncherMain.cpp

@@ -36 +36 @@
 #include <windows.h>
 
+#if defined _M_IX86
+#define PROCESSORARCHITECTURE "x86"
+#elif defined _M_IA64
+#define PROCESSORARCHITECTURE "ia64"
+#elif defined _M_X64
+#define PROCESSORARCHITECTURE "amd64"
+#else
+#define PROCESSORARCHITECTURE "*"
+#endif
+
+#pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='" PROCESSORARCHITECTURE "' publicKeyToken='6595b64144ccf1df' language='*'\"")
+#if defined(_MSC_VER) && (_MSC_VER >= 1600) && !defined(WIN_CAIRO)
+#pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.VC80.CRT' version='8.0.50727.6195' processorArchitecture='" PROCESSORARCHITECTURE "' publicKeyToken='1fc8b3b9a1e18e3b' language='*'\"")
+#endif
+
 static void enableTerminationOnHeapCorruption()
 {