wxMSW build fix. Switch JSCore build back to static.

git-svn-id: svn://svn.chromium.org/blink/trunk@42980 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/JavaScriptCore/API/JSBase.h

@@ -65,7 +65,9 @@ typedef struct OpaqueJSValue* JSObjectRef;
 /* JavaScript symbol exports */
 
 #undef JS_EXPORT
-#if defined(__GNUC__)
+#if defined(BUILDING_WX__)
+    #define JS_EXPORT
+#elif defined(__GNUC__)
     #define JS_EXPORT __attribute__((visibility("default")))
 #elif defined(WIN32) || defined(_WIN32)
     /*

third_party/WebKit/JavaScriptCore/ChangeLog

+2009-04-28  Kevin Ollivier <kevino@theolliviers.com>
+
+        wxMSW build fix. Switch JSCore build back to static. 
+
+        * API/JSBase.h:
+        * config.h:
+        * jscore.bkl:
+
 2009-04-28  Oliver Hunt  <oliver@apple.com>
 
         Reviewed by NOBODY (Build fix).

third_party/WebKit/JavaScriptCore/config.h

@@ -25,7 +25,7 @@
 
 #include <wtf/Platform.h>
 
-#if PLATFORM(WIN_OS)
+#if PLATFORM(WIN_OS) && !defined(BUILDING_WX__)
 #if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF)
 #define JS_EXPORTDATA __declspec(dllexport)
 #else

third_party/WebKit/JavaScriptCore/jscore.bkl

@@ -132,7 +132,6 @@ JavaScriptCore Bakefile project file.
         <sys-lib>$(READLINE_LIB)</sys-lib>
         <if cond="FORMAT in ['msvc','msvs2005prj']">
             <include>$(WK_ROOT)/WebKitLibraries/win/include</include>
-            <sys-lib>jscore</sys-lib>
             <sys-lib>winmm</sys-lib> <!-- for timeGetTime -->
             <lib-path>$(WKOUTPUTDIR)</lib-path>
             <lib-path>$(WK_ROOT)/WebKitLibraries/win/lib</lib-path>
@@ -145,10 +144,7 @@ JavaScriptCore Bakefile project file.
         <command>bash make-generated-sources.sh</command>
     </action>
 
-    <dll id="jscore" template="jscore_base,wxwk">
-        <define>BUILDING_JavaScriptCore</define>
-        <runtime-libs>dynamic</runtime-libs>
-        <dllname>jscore</dllname>
-        <libname>jscore</libname>
-    </dll>
+    <lib id="jscore" template="jscore_base,wx-lib">
+
+    </lib>
 </makefile>

third_party/WebKit/WebCore/ChangeLog

+2009-04-28  Kevin Ollivier <kevino@theolliviers.com>
+
+        wxMSW build fix. Switch JSCore build back to static.
+
+        * config.h:
+
 2009-04-28  Pierre d'Herbemont  <pdherbemont@apple.com>
 
         Reviewed by Simon Fraser.

third_party/WebKit/WebCore/config.h

@@ -24,7 +24,7 @@
 
 #include <wtf/Platform.h>
 
-#if PLATFORM(WIN_OS)
+#if PLATFORM(WIN_OS) && !defined(BUILDING_WX__)
 #if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF)
 #define JS_EXPORTDATA __declspec(dllexport)
 #else