diff options
Diffstat (limited to 'Source/JavaScriptCore')
| -rw-r--r-- | Source/JavaScriptCore/ChangeLog | 16 | ||||
| -rw-r--r-- | Source/JavaScriptCore/GNUmakefile.am | 8 | ||||
| -rw-r--r-- | Source/JavaScriptCore/JavaScriptCore.pri | 2 | ||||
| -rw-r--r-- | Source/JavaScriptCore/wtf/wtf.pri | 2 |
4 files changed, 22 insertions, 6 deletions
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog index 8408f380c..441521586 100644 --- a/Source/JavaScriptCore/ChangeLog +++ b/Source/JavaScriptCore/ChangeLog @@ -1,3 +1,19 @@ +2012-01-06 Eric Seidel <eric@webkit.org> and Gustavo Noronha Silva <gustavo.noronha@collabora.com> + + Make the new WTF module build on Gtk + https://bugs.webkit.org/show_bug.cgi?id=75669 + + * GNUmakefile.am: + +2012-01-06 Tor Arne Vestbø <tor.arne.vestbo@nokia.com> + + [Qt] Remove un-needed VPATHs from project includes + + Reviewed by Simon Hausmann. + + * JavaScriptCore.pri: + * wtf/wtf.pri: + 2012-01-06 Tor Arne Vestbø <tor.arne.vestbo@nokia.com> [Qt] Move listing of include paths and libs to pri files in sources diff --git a/Source/JavaScriptCore/GNUmakefile.am b/Source/JavaScriptCore/GNUmakefile.am index fc3ad8091..8498702dc 100644 --- a/Source/JavaScriptCore/GNUmakefile.am +++ b/Source/JavaScriptCore/GNUmakefile.am @@ -23,10 +23,11 @@ libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@ $(javascriptcore_sources) libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD = \ + -lpthread \ + libWTF.la \ $(UNICODE_LIBS) \ $(GLIB_LIBS) \ - $(WINMM_LIBS) \ - -lpthread + $(WINMM_LIBS) libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CXXFLAGS = \ $(global_cxxflags) \ @@ -68,6 +69,9 @@ javascriptcore_cppflags += \ -I$(srcdir)/Source/JavaScriptCore/yarr \ -I$(top_builddir)/DerivedSources/JavaScriptCore +javascriptcore_cppflags += \ + -I$(srcdir)/Source/WTF + javascriptcore_cflags += \ $(global_cflags) \ $(GLIB_CFLAGS) \ diff --git a/Source/JavaScriptCore/JavaScriptCore.pri b/Source/JavaScriptCore/JavaScriptCore.pri index 237de6137..65e0eb31a 100644 --- a/Source/JavaScriptCore/JavaScriptCore.pri +++ b/Source/JavaScriptCore/JavaScriptCore.pri @@ -28,8 +28,6 @@ INCLUDEPATH += \ $$SOURCE_DIR/ForwardingHeaders \ $$JAVASCRIPTCORE_GENERATED_SOURCES_DIR -VPATH += $$SOURCE_DIR - win32-* { DEFINES += _HAS_TR1=0 LIBS += -lwinmm diff --git a/Source/JavaScriptCore/wtf/wtf.pri b/Source/JavaScriptCore/wtf/wtf.pri index 2a3c609d5..176949f75 100644 --- a/Source/JavaScriptCore/wtf/wtf.pri +++ b/Source/JavaScriptCore/wtf/wtf.pri @@ -16,8 +16,6 @@ INCLUDEPATH += \ $$SOURCE_DIR/qt \ $$SOURCE_DIR/unicode -VPATH += $$SOURCE_DIR - contains(CONFIG, use_system_icu) { DEFINES += WTF_USE_ICU_UNICODE=1 DEFINES -= WTF_USE_QT4_UNICODE |