JavaScriptCore-1218.tar.gz

[apple/javascriptcore.git] / JavaScriptCore.pri

diff --git a/JavaScriptCore.pri b/JavaScriptCore.pri
index 4a8ecd42feb47b58bc0f598612fe2926a6961baa..b636e587cee7c16b0e190a2ac955210ed2d8237f 100644 (file)
--- a/JavaScriptCore.pri
+++ b/JavaScriptCore.pri
@@ -19,6 +19,7 @@ INCLUDEPATH += \
     $$SOURCE_DIR/heap \
     $$SOURCE_DIR/dfg \
     $$SOURCE_DIR/debugger \
+    $$SOURCE_DIR/disassembler \
     $$SOURCE_DIR/interpreter \
     $$SOURCE_DIR/jit \
     $$SOURCE_DIR/llint \
@@ -31,17 +32,15 @@ INCLUDEPATH += \
     $$SOURCE_DIR/ForwardingHeaders \
     $$JAVASCRIPTCORE_GENERATED_SOURCES_DIR
 
-win32-* {
-    LIBS += -lwinmm
+# Pick up the right version of LLIntAssembly.h
+macx: INCLUDEPATH += $$JAVASCRIPTCORE_GENERATED_SOURCES_DIR/$$targetSubDir()
 
-    win32-g++* {
-        LIBS += -lpthreadGC2
-    } else:win32-msvc* {
-        LIBS += -lpthreadVC2
-    }
-}
+win32-*: LIBS += -lwinmm
 
 wince* {
-    INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/ce-compat
     INCLUDEPATH += $$SOURCE_DIR/os-win32
 }
+
+linux-*:if(isEqual(QT_ARCH, "i386")|isEqual(QT_ARCH, "x86_64")) {
+    INCLUDEPATH += $$SOURCE_DIR/disassembler/udis86
+}