Changeset 52355 in webkit for trunk/JavaScriptCore/JavaScriptCore.pri

Timestamp:

Dec 18, 2009, 4:29:53 PM (15 years ago)

Author:

[email protected]

Message:

2009-12-18 Laszlo Gombos <Laszlo Gombos>

Reviewed by Kenneth Rohde Christiansen.

Move some build decisions from Qt build system into source files
​https://bugs.webkit.org/show_bug.cgi?id=31956

• JavaScriptCore.pri: Compile files unconditionally
• jit/ExecutableAllocatorPosix.cpp: Guard with PLATFORM(UNIX) && !PLATFORM(SYMBIAN)
• jit/ExecutableAllocatorWin.cpp: Guard with PLATFORM(WIN_OS)
• runtime/MarkStackPosix.cpp: Guard with PLATFORM(UNIX) && !PLATFORM(SYMBIAN)
• runtime/MarkStackSymbian.cpp: Guard with PLATFORM(SYMBIAN)
• runtime/MarkStackWin.cpp: Guard with PLATFORM(WIN_OS)
• wtf/Platform.h: Guard ENABLE_JSC_MULTIPLE_THREADS with ENABLE_SINGLE_THREADED for the Qt port
• wtf/ThreadingNone.cpp: Guard with ENABLE(SINGLE_THREADED)
• wtf/qt/ThreadingQt.cpp: Guard with !ENABLE(SINGLE_THREADED)

File:

• trunk/JavaScriptCore/JavaScriptCore.pri (modified) (4 diffs)

trunk/JavaScriptCore/JavaScriptCore.pri

@@ -116 +116 @@
     interpreter/Interpreter.cpp \
     interpreter/RegisterFile.cpp \
+    jit/ExecutableAllocatorPosix.cpp \
+    jit/ExecutableAllocatorSymbian.cpp \
+    jit/ExecutableAllocatorWin.cpp \
     jit/ExecutableAllocator.cpp \
     jit/JITArithmetic.cpp \
@@ -183 +186 @@
     runtime/LiteralParser.cpp \
     runtime/Lookup.cpp \
+    runtime/MarkStackPosix.cpp \
+    runtime/MarkStackSymbian.cpp \
+    runtime/MarkStackWin.cpp \
     runtime/MarkStack.cpp \
     runtime/MathObject.cpp \
@@ -219 +225 @@
     wtf/MainThread.cpp \
     wtf/qt/MainThreadQt.cpp \
+    wtf/qt/ThreadingQt.cpp \
     wtf/RandomNumber.cpp \
     wtf/RefCountedLeakCounter.cpp \
+    wtf/ThreadingNone.cpp \
     wtf/Threading.cpp \
     wtf/TypeTraits.cpp \
@@ -230 +238 @@
     yarr/RegexJIT.cpp
 
-symbian {
-    SOURCES += jit/ExecutableAllocatorSymbian.cpp \
-              runtime/MarkStackSymbian.cpp
-} else {
-    win32-*|wince* {
-        SOURCES += jit/ExecutableAllocatorWin.cpp \
-                  runtime/MarkStackWin.cpp
-    } else {
-        SOURCES += jit/ExecutableAllocatorPosix.cpp \
-                  runtime/MarkStackPosix.cpp
-    }
-}
-
 !contains(DEFINES, USE_SYSTEM_MALLOC) {
     SOURCES += wtf/TCSystemAlloc.cpp
-}
-
-!contains(DEFINES, ENABLE_SINGLE_THREADED=1) {
-    SOURCES += wtf/qt/ThreadingQt.cpp
-} else {
-    DEFINES += ENABLE_JSC_MULTIPLE_THREADS=0
-    SOURCES += wtf/ThreadingNone.cpp
 }