Reviewed by John.
authorkmccullo <kmccullo@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 16 Oct 2006 23:12:03 +0000 (23:12 +0000)
committerkmccullo <kmccullo@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 16 Oct 2006 23:12:03 +0000 (23:12 +0000)
        Fixes a compile order issue for testkjs on win.

        * JavaScriptCore.vcproj/testkjs/testkjs.vcproj:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@17072 268f45cc-cd09-0410-ab3c-d52691b4dbfc

JavaScriptCore/ChangeLog
JavaScriptCore/JavaScriptCore.vcproj/testkjs/testkjs.vcproj

index 551fdb601b160a31a007bbdd4a8f8d7e5ee7f98e..be1f7d58d1434d7d2d2f89161f475d7a6cdacaec 100644 (file)
@@ -1,3 +1,11 @@
+2006-10-16  Kevin McCullough  <KMcCullough@apple.com>
+
+        Reviewed by John.
+
+        Fixes a compile order issue for testkjs on win.
+
+        * JavaScriptCore.vcproj/testkjs/testkjs.vcproj:
+
 2006-10-15  Krzysztof Kowalczyk  <kkowalczyk@gmail.com>
 
         Reviewed by Anders.
index b7fce5625745e3a03abf0578a4036eb421fa697c..3a38ff021c7a3eb0987b4ed2aeee7243524f41dd 100644 (file)
@@ -25,6 +25,7 @@
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
+                               CommandLine="if not &quot;$(BuildBot)&quot;==&quot;&quot; exit /b&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitSDKDir)\bin\icudt34.dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitSDKDir)\bin\icudt34$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitSDKDir)\bin\icuuc34$(ConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;xcopy /y /d &quot;$(WebKitSDKDir)\bin\icuuc34$(ConfigSuffix).pdb&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
@@ -67,7 +68,7 @@
                                AdditionalDependencies="JavaScriptCore$(ConfigSuffix).lib icuuc$(ConfigSuffix).lib winmm.lib"
                                OutputFile="$(OutDir)\$(ProjectName)$(ConfigSuffix).exe"
                                LinkIncremental="2"
-                               AdditionalLibraryDirectories="&quot;$(WebKitSDKDir)\lib&quot;;..\..\..\icu\lib;&quot;$(WebKitOutputDir)\lib&quot;"
+                               AdditionalLibraryDirectories="&quot;$(WebKitOutputDir)\lib&quot;;..\..\..\icu\lib;&quot;$(WebKitSDKDir)\lib&quot;"
                                GenerateDebugInformation="true"
                                SubSystem="1"
                                TargetMachine="1"