[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
laszlo.1.gombos at nokia.com
laszlo.1.gombos at nokia.com
Wed Apr 7 23:07:37 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 6b036fad302dece88792e52637af779eeb7f4748
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 27 02:10:18 2009 +0000
2009-10-26 Laszlo Gombos <laszlo.1.gombos at nokia.com>
Reviewed by Darin Adler.
Make .rc files compile on Windows without depending on MFC headers
https://bugs.webkit.org/show_bug.cgi?id=30750
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.rc: Use
winresrc.h because it exists even when MFC is not installed, and is
all that's needed here.
* WebCore.vcproj/QTMovieWin.rc: Ditto.
* WebKit.vcproj/WebKit.rc: Ditto.
* DumpRenderTree/win/TestNetscapePlugin/TestNetscapePlugin.rc: Use
windows.h instead of afxres.h because it exists even when MFC is not
installed, and is all that's needed here.
* FindSafari/FindSafari.rc: Ditto
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50120 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 007ea01..72957b6 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-26 Laszlo Gombos <laszlo.1.gombos at nokia.com>
+
+ Reviewed by Darin Adler.
+
+ Make .rc files compile on Windows without depending on MFC headers
+ https://bugs.webkit.org/show_bug.cgi?id=30750
+
+ * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.rc: Use
+ winresrc.h because it exists even when MFC is not installed, and is
+ all that's needed here.
+
2009-10-26 Gabor Loki <loki at inf.u-szeged.hu>
Reviewed by Gavin Barraclough.
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.rc b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.rc
index f2b0dd3..ba59bb8 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.rc
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.rc
@@ -1,7 +1,7 @@
// Microsoft Visual C++ generated resource script.
//
#include "autoversion.h"
-#include "winres.h"
+#include "winresrc.h"
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index aacfabe..a8da638 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-10-26 Laszlo Gombos <laszlo.1.gombos at nokia.com>
+
+ Reviewed by Darin Adler.
+
+ Make .rc files compile on Windows without depending on MFC headers
+ https://bugs.webkit.org/show_bug.cgi?id=30750
+
+ * WebCore.vcproj/QTMovieWin.rc: Use winresrc.h because it exists
+ even when MFC is not installed, and is all that's needed here.
+
2009-10-26 Brent Fulgham <bfulgham at webkit.org>
Reviewed by Darin Adler.
diff --git a/WebCore/WebCore.vcproj/QTMovieWin.rc b/WebCore/WebCore.vcproj/QTMovieWin.rc
index 1ed0428..cbc8918 100644
--- a/WebCore/WebCore.vcproj/QTMovieWin.rc
+++ b/WebCore/WebCore.vcproj/QTMovieWin.rc
@@ -1,7 +1,7 @@
// Microsoft Visual C++ generated resource script.
//
#include "autoversion.h"
-#include "winres.h"
+#include "winresrc.h"
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index f236e6e..9fb0c05 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,13 @@
+2009-10-26 Laszlo Gombos <laszlo.1.gombos at nokia.com>
+
+ Reviewed by Darin Adler.
+
+ Make .rc files compile on Windows without depending on MFC headers
+ https://bugs.webkit.org/show_bug.cgi?id=30750
+
+ * WebKit.vcproj/WebKit.rc: Use winresrc.h because it exists even
+ when MFC is not installed, and is all that's needed here.
+
2009-10-26 Sam Weinig <sam at webkit.org>
Rubber-stamped by Darin Adler.
diff --git a/WebKit/win/WebKit.vcproj/WebKit.rc b/WebKit/win/WebKit.vcproj/WebKit.rc
index a7cbfd3..3d00011 100644
--- a/WebKit/win/WebKit.vcproj/WebKit.rc
+++ b/WebKit/win/WebKit.vcproj/WebKit.rc
@@ -2,7 +2,7 @@
//
#include "resource.h"
#include "autoversion.h"
-#include "winres.h"
+#include "winresrc.h"
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 94adbdb..e9f7a5b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2009-10-26 Laszlo Gombos <laszlo.1.gombos at nokia.com>
+
+ Reviewed by Darin Adler.
+
+ Make .rc files compile on Windows without depending on MFC headers
+ https://bugs.webkit.org/show_bug.cgi?id=30750
+
+ * DumpRenderTree/win/TestNetscapePlugin/TestNetscapePlugin.rc: Use
+ windows.h instead of afxres.h because it exists even when MFC is not
+ installed, and is all that's needed here.
+
+ * FindSafari/FindSafari.rc: Ditto
+
2009-10-24 Eric Seidel <eric at webkit.org>
Reviewed by Adam Barth.
diff --git a/WebKitTools/DumpRenderTree/win/TestNetscapePlugin/TestNetscapePlugin.rc b/WebKitTools/DumpRenderTree/win/TestNetscapePlugin/TestNetscapePlugin.rc
index cccc69c..a8fbbcd 100644
--- a/WebKitTools/DumpRenderTree/win/TestNetscapePlugin/TestNetscapePlugin.rc
+++ b/WebKitTools/DumpRenderTree/win/TestNetscapePlugin/TestNetscapePlugin.rc
@@ -7,7 +7,7 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "afxres.h"
+#include "windows.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -34,7 +34,7 @@ END
2 TEXTINCLUDE
BEGIN
- "#include ""afxres.h""\r\n"
+ "#include ""windows.h""\r\n"
"\0"
END
diff --git a/WebKitTools/FindSafari/FindSafari.rc b/WebKitTools/FindSafari/FindSafari.rc
index 20c2da2..7d4abac 100644
--- a/WebKitTools/FindSafari/FindSafari.rc
+++ b/WebKitTools/FindSafari/FindSafari.rc
@@ -7,7 +7,7 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "afxres.h"
+#include "windows.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -34,7 +34,7 @@ END
2 TEXTINCLUDE
BEGIN
- "#include ""afxres.h""\r\n"
+ "#include ""windows.h""\r\n"
"\0"
END
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list