Changeset 42229 in webkit for trunk/JavaScriptCore

Timestamp:

Apr 4, 2009, 5:06:29 PM (16 years ago)

Author:

[email protected]

Message:

wx build fixes for the Windows port.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCoreSources.bkl (modified) (1 diff)
• jscore.bkl (modified) (1 diff)
• wtf/Platform.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-04-04  Kevin Ollivier  <[email protected]>
+
+        wx build fix for Win port. Build the assembler sources to get missing functions.
+
+        * JavaScriptCoreSources.bkl:
+        * jscore.bkl:
+        * wtf/Platform.h:
+
 2009-04-02  Darin Adler  <[email protected]>
 

trunk/JavaScriptCore/JavaScriptCoreSources.bkl

@@ -158 +158 @@
         bytecode/SamplingTool.cpp
         interpreter/RegisterFile.cpp
+        jit/ExecutableAllocator.cpp
+    </set>
+    <set append="1" var="JSCORE_VM_SOURCES_WIN">
+       jit/ExecutableAllocatorWin.cpp
+    </set>
+   <set append="1" var="JSCORE_VM_SOURCES_POSIX">
+       jit/ExecutableAllocatorPosix.cpp
     </set>
     <set append="1" var="JSCORE_WTF_SOURCES">

trunk/JavaScriptCore/jscore.bkl

@@ -48 +48 @@
             $(JSCORE_VM_SOURCES)
             $(JSCORE_WTF_SOURCES)
+        </sources>
+
+        <set var="ASSEMBLER_SOURCES">
+            <if cond="WX_PORT=='gtk2'">
+                $(JSCORE_VM_SOURCES_POSIX)
+            </if>
+            <if cond="PLATFORM_OS=='mac'">
+                $(JSCORE_VM_SOURCES_POSIX)
+            </if>
+            <if cond="WX_PORT=='msw'">
+                $(JSCORE_VM_SOURCES_WIN)
+            </if>
+        </set>
+
+        <sources>
+            $(ASSEMBLER_SOURCES)
         </sources>
         <install-to>$(WKOUTPUTDIR)</install-to>

trunk/JavaScriptCore/wtf/Platform.h

@@ -325 +325 @@
 
 #if PLATFORM(WX)
+#define ENABLE_ASSEMBLER 1
 #define WTF_USE_CURL 1
 #define WTF_USE_PTHREADS 1