diff options
Diffstat (limited to 'src/script/script.pro')
| -rw-r--r-- | src/script/script.pro | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/src/script/script.pro b/src/script/script.pro index c844d892b4..6c6b701099 100644 --- a/src/script/script.pro +++ b/src/script/script.pro @@ -11,8 +11,7 @@ unix:QMAKE_PKGCONFIG_REQUIRES = QtCore include(../qbase.pri) -# Disable a few warnings on Windows. -win32-msvc*: QMAKE_CXXFLAGS += -wd4291 -wd4344 -wd4503 -wd4800 -wd4819 -wd4996 -wd4396 -wd4099 +CONFIG += building-libs # FIXME: shared the statically built JavaScriptCore @@ -21,25 +20,16 @@ win32-msvc*: QMAKE_CXXFLAGS += -wd4291 -wd4344 -wd4503 -wd4800 -wd4819 -wd4996 - WEBKITDIR = $$(WEBKITDIR) isEmpty(WEBKITDIR) { WEBKITDIR = $$PWD/../3rdparty/javascriptcore - - # FIXME: not needed once JSCBISON works - # TODO: or leave it like this since the generated file is available anyway? - SOURCES += $$WEBKITDIR/JavaScriptCore/generated/Grammar.cpp - - # avoid warnings when parsing JavaScriptCore.pri - # (we don't care about generating files, we already have them generated) - defineTest(addExtraCompiler) { - return(true) - } - defineTest(addExtraCompilerWithHeader) { - return(true) - } + GENERATED_SOURCES_DIR = generated } else { message(using external WebKit from $$WEBKITDIR) - CONFIG += building-libs CONFIG -= QTDIR_build - include($$WEBKITDIR/WebKit.pri) } +include($$WEBKITDIR/WebKit.pri) + +# Disable a few warnings on Windows. +# These are in addition to the ones disabled in WebKit.pri +win32-msvc*: QMAKE_CXXFLAGS += -wd4396 -wd4099 # Windows CE-specific stuff copied from WebCore.pro # ### Should rather be in JavaScriptCore.pri? @@ -67,10 +57,9 @@ INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/bytecode INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/assembler INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/generated -DEFINES += BUILDING_QT__=1 -DEFINES += USE_SYSTEM_MALLOC -DEFINES += WTF_USE_JAVASCRIPTCORE_BINDINGS=1 -DEFINES += WTF_CHANGES=1 +# This line copied from WebCore.pro +DEFINES += WTF_USE_JAVASCRIPTCORE_BINDINGS=1 WTF_CHANGES=1 + DEFINES += NDEBUG INCLUDEPATH += $$PWD |