JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / JavaScriptCore.vcxproj / JavaScriptCore.proj

diff --git a/JavaScriptCore.vcxproj/JavaScriptCore.proj b/JavaScriptCore.vcxproj/JavaScriptCore.proj
index 6b3f9718d43ffabd995b29cb1d29f6ee4b59bd3a..b89bac494b47f26d1556b8b26902a592773a96a4 100644 (file)
--- a/JavaScriptCore.vcxproj/JavaScriptCore.proj
+++ b/JavaScriptCore.vcxproj/JavaScriptCore.proj
@@ -4,9 +4,11 @@
   <!-- normalize configuration case -->\r
   <PropertyGroup Condition="'$(CONFIGURATION)'=='Release'">\r
        <CONFIG>Production</CONFIG>\r
+    <DebugSuffix></DebugSuffix>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(CONFIGURATION)'=='Debug'">\r
        <CONFIG>DebugSuffix</CONFIG>\r
+    <DebugSuffix>_debug</DebugSuffix>\r
   </PropertyGroup>\r
 \r
   <!-- Wrapper to build JavaScriptCore for both win32 and x64. -->\r
@@ -60,7 +62,7 @@
     <Message Text="Building $(CONFIGURATION) Solution" />\r
     <Error Text="DSTROOT property or environment variable must be defined." Condition="'$(DSTROOT)' == ''" />\r
     <Message Text="Output=$(WebKit_OutputDir)" />\r
-    <MSBuild Projects="@(JavaScriptCore)" Properties="Configuration=$(CONFIG)" Targets="ReBuild" />\r
+    <MSBuild Projects="@(JavaScriptCore)" Properties="Configuration=$(CONFIG)" Targets="Build" />\r
   </Target>\r
 \r
   <Target Name="PostBuild" AfterTargets="Build">\r
@@ -83,6 +85,18 @@
     <CreateItem Include="$(ConfigurationBuildDir)\bin64\*.pdb">\r
       <Output TaskParameter="Include" ItemName="Bin64SymbolFiles" />\r
     </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\bin32\JavaScriptCore$(DebugSuffix).dll">\r
+      <Output TaskParameter="Include" ItemName="Bin32DLLFiles" />\r
+    </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\bin64\JavaScriptCore$(DebugSuffix).dll">\r
+      <Output TaskParameter="Include" ItemName="Bin64DLLFiles" />\r
+    </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\bin32\*.resources">\r
+      <Output TaskParameter="Include" ItemName="Bin32ResourceFolders" />\r
+    </CreateItem>\r
+    <CreateItem Include="$(ConfigurationBuildDir)\bin64\*.resources">\r
+      <Output TaskParameter="Include" ItemName="Bin64ResourceFolders" />\r
+    </CreateItem>\r
     <CreateItem Include="$(ConfigurationBuildDir)\bin32\JavaScriptCore.resources\**\*.*">\r
       <Output TaskParameter="Include" ItemName="Bin32Resources" />\r
     </CreateItem>\r
@@ -106,11 +120,13 @@
     <Copy SourceFiles="@(Lib32Files)" DestinationFolder="$(AppleInternalLib32)" />\r
     <Copy SourceFiles="@(Lib64Files)" DestinationFolder="$(AppleInternalLib64)" />\r
     <Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(AppleInternalBin32)" />\r
-    <Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />\r
+    <Copy SourceFiles="@(Bin32DLLFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />\r
+    <Copy SourceFiles="@(Bin32ResourceFolders)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS32)" />\r
     <Copy SourceFiles="@(Bin32SymbolFiles)" DestinationFolder="$(AppleInternal32Symbols)" />\r
     <Copy SourceFiles="@(Bin32Resources)" DestinationFiles="@(Bin32Resources->'$(DSTROOT)\$(ProgramFilesAAS32)\JavaScriptCore.resources\%(RecursiveDir)%(Filename)%(Extension)')" />\r
     <Copy SourceFiles="@(Bin64Files)" DestinationFolder="$(AppleInternalBin64)" />\r
-    <Copy SourceFiles="@(Bin64Files)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />\r
+    <Copy SourceFiles="@(Bin64DLLFiles)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />\r
+    <Copy SourceFiles="@(Bin64ResourceFolders)" DestinationFolder="$(DSTROOT)\$(ProgramFilesAAS64)" />\r
     <Copy SourceFiles="@(Bin64SymbolFiles)" DestinationFolder="$(AppleInternal64Symbols)" />\r
     <Copy SourceFiles="@(Bin64Resources)" DestinationFiles="@(Bin64Resources->'$(DSTROOT)\$(ProgramFilesAAS64)\JavaScriptCore.resources\%(RecursiveDir)%(Filename)%(Extension)')" />\r
     <Copy SourceFiles="@(Derived32Sources)" DestinationFiles="@(Derived32Sources->'$(DSTROOT)\AppleInternal\Sources32\JavaScriptCore\%(RecursiveDir)%(Filename)%(Extension)')" />\r