X-Git-Url: https://git.saurik.com/apple/javascriptcore.git/blobdiff_plain/81345200c95645a1b0d2635520f96ad55dfde63f..refs/heads/master:/JavaScriptCore.vcxproj/JavaScriptCore.proj

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