git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 29d3da7)
2010-09-21 Fridrich Strba <fridrich.strba@bluewin.ch>
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 21 Sep 2010 17:44:31 +0000 (17:44 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 21 Sep 2010 17:44:31 +0000 (17:44 +0000)
        Reviewed by Martin Robinson.

        Fix linking issues of the GTK+ port on Windows
        https://bugs.webkit.org/show_bug.cgi?id=45844

        * GNUmakefile.am: link on Windows with ole32.dll, winmm.dll and shlwapi.dll
        * configure.ac: link on Windows with ole32.dll, winmm.dll and shlwapi.dll
        and export correctly all needed symbols from the libwebkitgtk DLL.
2010-09-21  Fridrich Strba  <fridrich.strba@bluewin.ch>

        Reviewed by Martin Robinson.

        Build issues with Windows versions of the GTK+ port
        https://bugs.webkit.org/show_bug.cgi?id=45844

        Link with winmm.dll when necessary and specify the executable extension
        explicitely so that the Programs/jsc-@WEBKITGTK_API_MAJOR_VERSION@
        rule actually works.

        Don't try to build the ThreadSpecificWin.cpp since GTK+ port uses
        a section in ThreadSpecific.cpp

        * GNUmakefile.am:
2010-09-21  Fridrich Strba  <fridrich.strba@bluewin.ch>

        Reviewed by Martin Robinson.

        Fix linking problems on Windows.
        https://bugs.webkit.org/show_bug.cgi?id=45844

        * GNUmakefile.am: link the executables with winmm.dll

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@67963 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog patch | blob | history
GNUmakefile.am patch | blob | history
JavaScriptCore/ChangeLog patch | blob | history
JavaScriptCore/GNUmakefile.am patch | blob | history
WebKitTools/ChangeLog patch | blob | history
WebKitTools/GNUmakefile.am patch | blob | history
configure.ac patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index 8db9c7341626b3c30ac16fb24bbf69a81f59d6ee..d935052ecf213a9b0f04017fe77182d5e8479298 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-21  Fridrich Strba  <fridrich.strba@bluewin.ch>
+
+        Reviewed by Martin Robinson.
+
+        Fix linking issues of the GTK+ port on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=45844
+
+        * GNUmakefile.am: link on Windows with ole32.dll, winmm.dll and shlwapi.dll
+        * configure.ac: link on Windows with ole32.dll, winmm.dll and shlwapi.dll
+        and export correctly all needed symbols from the libwebkitgtk DLL.
+
 2010-09-21  Xan Lopez  <xlopez@igalia.com>
 
         Reviewed by Martin Robinson.
diff --git a/GNUmakefile.am b/GNUmakefile.am
index 03cad1a336dc4caf4890d03c53132a84a6e5a15a..c769db2db85df0c6c5f4ef67df6b210d45e835de 100644 (file)
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -101,7 +101,7 @@ global_cxxflags += \
 # It breaks the build on other platforms, so we use it conditionally
 if OS_WIN32
 no_undefined = -no-undefined
-version_script = -export-symbols-regex "^(webkit_|JS).*"
+version_script = -export-symbols-regex "^(webkit_|k?JS).*"
 endif
 
 if OS_GNU
@@ -245,7 +245,10 @@ libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBA
        $(PNG_LIBS) \
        $(SQLITE3_LIBS) \
        $(UNICODE_LIBS) \
-       $(XT_LIBS)
+       $(XT_LIBS) \
+       $(WINMM_LIBS) \
+       $(SHLWAPI_LIBS) \
+       $(OLE32_LIBS)
 
 #
 # Extra checks and flags
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 2481142d790037cf9e1983bbf583062ced5bf792..649233c3d7b6a67ff5a7fb6df501e857749990cc 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-09-21  Fridrich Strba  <fridrich.strba@bluewin.ch>
+
+        Reviewed by Martin Robinson.
+
+        Build issues with Windows versions of the GTK+ port
+        https://bugs.webkit.org/show_bug.cgi?id=45844
+
+        Link with winmm.dll when necessary and specify the executable extension
+        explicitely so that the Programs/jsc-@WEBKITGTK_API_MAJOR_VERSION@
+        rule actually works.
+
+        Don't try to build the ThreadSpecificWin.cpp since GTK+ port uses
+        a section in ThreadSpecific.cpp
+
+        * GNUmakefile.am:
+
 2010-09-21  Martin Robinson  <mrobinson@igalia.com>
 
         Reviewed by Xan Lopez.
diff --git a/JavaScriptCore/GNUmakefile.am b/JavaScriptCore/GNUmakefile.am
index 2bf2cb83066d08b6c2cdba28ea22a5d6098dbb41..88d17617b3a4b8884c04a26868c6f06d1731c750 100644 (file)
--- a/JavaScriptCore/GNUmakefile.am
+++ b/JavaScriptCore/GNUmakefile.am
@@ -546,7 +546,6 @@ javascriptcore_sources += \
 
 if TARGET_WIN32
 javascriptcore_sources += \
-       JavaScriptCore/wtf/ThreadSpecificWin.cpp \
        JavaScriptCore/runtime/MarkStackWin.cpp
 else
 javascriptcore_sources += \
@@ -586,7 +585,7 @@ JavaScriptCore/pcre/chartables.c: $(srcdir)/JavaScriptCore/pcre/dftables
        $(AM_V_GEN)$(PERL) $^ $@
 
 bin_PROGRAMS += \
-       Programs/jsc-@WEBKITGTK_API_MAJOR_VERSION@
+       Programs/jsc-@WEBKITGTK_API_MAJOR_VERSION@$(EXEEXT)
 
 noinst_PROGRAMS += \
        Programs/jsc \
@@ -616,6 +615,7 @@ Programs_minidom_CFLAGS = \
 
 Programs_minidom_LDADD = \
         libJavaScriptCore.la \
+        $(WINMM_LIBS) \
         -lm \
         -lstdc++
 
@@ -624,8 +624,8 @@ Programs_minidom_LDFLAGS = \
        -no-fast-install
 
 # jsc
-Programs/jsc-@WEBKITGTK_API_MAJOR_VERSION@: Programs/jsc
-       $(AM_V_GEN)cp -f Programs/jsc Programs/jsc-@WEBKITGTK_API_MAJOR_VERSION@
+Programs/jsc-@WEBKITGTK_API_MAJOR_VERSION@$(EXEEXT): Programs/jsc$(EXEEXT)
+       $(AM_V_GEN)cp -f Programs/jsc$(EXEEXT) Programs/jsc-@WEBKITGTK_API_MAJOR_VERSION@$(EXEEXT)
 Programs_jsc_@WEBKITGTK_API_MAJOR_VERSION@_LDADD =
 Programs_jsc_@WEBKITGTK_API_MAJOR_VERSION@_SOURCES =
 
@@ -644,7 +644,8 @@ Programs_jsc_CXXFLAGS = \
        $(UNICODE_CFLAGS)
 
 Programs_jsc_LDADD = \
-       libJavaScriptCore.la
+       libJavaScriptCore.la \
+       $(WINMM_LIBS)
 
 EXTRA_DIST += \
        JavaScriptCore/AUTHORS \
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index f8055129f1dc60cf2dd5c38296e6515c5f6b453a..5c8134a21fb90958cc796d22d921aabb55fb0995 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-21  Fridrich Strba  <fridrich.strba@bluewin.ch>
+
+        Reviewed by Martin Robinson.
+
+        Fix linking problems on Windows.
+        https://bugs.webkit.org/show_bug.cgi?id=45844
+
+        * GNUmakefile.am: link the executables with winmm.dll
+
 2010-09-21  Adam Barth  <abarth@webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/GNUmakefile.am b/WebKitTools/GNUmakefile.am
index 292ca7ea9a29d265ed3d16881bec7979eb0f5e39..e384101731c1fb7a09292366bf24a8606cb4ddc3 100644 (file)
--- a/WebKitTools/GNUmakefile.am
+++ b/WebKitTools/GNUmakefile.am
@@ -24,7 +24,8 @@ Programs_GtkLauncher_CFLAGS = \
 Programs_GtkLauncher_LDADD = \
        libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
        $(GTK_LIBS) \
-       $(GLIB_LIBS)
+       $(GLIB_LIBS) \
+       $(WINMM_LIBS)
 
 Programs_GtkLauncher_LDFLAGS = \
        -no-fast-install \
@@ -100,7 +101,8 @@ Programs_DumpRenderTree_LDADD = \
        $(GTK_LIBS) \
        $(GLIB_LIBS) \
        $(LIBSOUP_LIBS) \
-       $(FREETYPE_LIBS)
+       $(FREETYPE_LIBS) \
+       $(WINMM_LIBS)
 
 Programs_DumpRenderTree_LDFLAGS = \
        -no-fast-install \
diff --git a/configure.ac b/configure.ac
index 29ba3aedc3861ef554aa5951ab97f69286037209..dea741a4180c923f9bfc05077544679365dcd908 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -167,6 +167,17 @@ if test "$png_ok" != yes; then
 fi
 AC_SUBST([PNG_LIBS])
 
+
+if test "$os_win32" = "yes"; then
+  WINMM_LIBS=-lwinmm
+  SHLWAPI_LIBS=-lshlwapi
+  OLE32_LIBS=-lole32
+fi
+AC_SUBST([WINMM_LIBS])
+AC_SUBST([SHLWAPI_LIBS])
+AC_SUBST([OLE32_LIBS])
+
+
 # determine the GTK+ version to use
 AC_MSG_CHECKING([the GTK+ version to use])
 AC_ARG_WITH([gtk],
Mirror of the WebKit open source project from svn.webkit.org.