Lei Shi 9 سال پیش
والد
کامیت
d2461fe1af

+ 17 - 16
lib/Backend/Chakra.Backend.vcxproj

@@ -26,6 +26,7 @@
     <ClCompile>
       <AdditionalIncludeDirectories>
         $(MSBuildThisFileDirectory);
+        $(MSBuildThisFileDirectory)..;
         $(MSBuildThisFileDirectory)\$(PlatformPathNameAlt);
         $(MSBuildThisFileDirectory)..\Common;
         $(MSBuildThisFileDirectory)..\Runtime;
@@ -193,11 +194,11 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)TempTracker.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)ValueRelativeOffset.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)Inline.cpp" />
-    <ClCompile Include="JITOutput.cpp" />
-    <ClCompile Include="JITTimeFunctionBody.cpp" />
-    <ClCompile Include="JITTimeProfileInfo.cpp" />
-    <ClCompile Include="JITTimeScriptContext.cpp" />
-    <ClCompile Include="JITTimeWorkItem.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)JITOutput.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)JITTimeFunctionBody.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)JITTimeProfileInfo.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)JITTimeScriptContext.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)JITTimeWorkItem.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="AgenPeeps.h" />
@@ -439,17 +440,17 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="AsmJsJITInfo.cpp" />
-    <ClCompile Include="FunctionJITRuntimeInfo.cpp" />
-    <ClCompile Include="FunctionJITTimeInfo.cpp" />
-    <ClCompile Include="JITObjTypeSpecFldInfo.cpp" />
-    <ClCompile Include="JITTimeConstructorCache.cpp" />
-    <ClCompile Include="JITTimePolymorphicInlineCache.cpp" />
-    <ClCompile Include="JITTimePolymorphicInlineCacheInfo.cpp" />
-    <ClCompile Include="JITType.cpp" />
-    <ClCompile Include="JITTypeHandler.cpp" />
-    <ClCompile Include="ServerScriptContext.cpp" />
-    <ClCompile Include="ServerThreadContext.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)AsmJsJITInfo.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)FunctionJITRuntimeInfo.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)FunctionJITTimeInfo.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)JITObjTypeSpecFldInfo.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)JITTimeConstructorCache.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)JITTimePolymorphicInlineCache.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)JITTimePolymorphicInlineCacheInfo.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)JITType.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)JITTypeHandler.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)ServerScriptContext.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)ServerThreadContext.cpp" />
   </ItemGroup>
   <Import Project="$(BuildConfigPropsPath)Chakra.Build.targets" Condition="exists('$(BuildConfigPropsPath)Chakra.Build.targets')" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+ 2 - 2
lib/JITClient/Chakra.JITClient.vcxproj

@@ -33,10 +33,10 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)JITClientPch.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="JITClientStub.c">
+    <ClCompile Include="$(MSBuildThisFileDirectory)JITClientStub.c">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="JITManager.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)JITManager.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="JITClient.h" />

+ 1 - 0
lib/JITIDL/Chakra.JITIDL.vcxproj

@@ -22,6 +22,7 @@
     <Midl Include="$(MsBuildThisFileDirectory)ChakraJIT.idl">
       <OutputDirectory>$(IntDir)</OutputDirectory>
       <AdditionalOptions>%(AdditionalOptions) /prefix client "Client" server "Server"</AdditionalOptions>
+      <AdditionalOptions Condition="'$(BuildingWithBuildExe)'=='false'">%(AdditionalOptions) /target NT60 </AdditionalOptions>
     </Midl>
   </ItemGroup>
   <Import Project="$(BuildConfigPropsPath)Chakra.Build.targets" Condition="exists('$(BuildConfigPropsPath)Chakra.Build.targets')" />

+ 3 - 3
lib/JITServer/Chakra.JITServer.vcxproj

@@ -19,13 +19,13 @@
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
   </PropertyGroup>
   <ItemGroup>
-    <ClCompile Include="JITServerStub.c">
+    <ClCompile Include="$(MSBuildThisFileDirectory)JITServerStub.c">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="JITServerPch.cpp">
+    <ClCompile Include="$(MSBuildThisFileDirectory)JITServerPch.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="JITServer.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)JITServer.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="JITServerPch.h" />

+ 3 - 3
lib/Runtime/Base/Chakra.Runtime.Base.vcxproj

@@ -68,9 +68,9 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)RuntimeBasePch.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="ThreadContextInfo.cpp" />
-    <ClCompile Include="jitprofiling.cpp" />
-    <ClCompile Include="VTuneChakraProfile.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)ThreadContextInfo.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)jitprofiling.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)VTuneChakraProfile.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="CompactCounters.h" />

+ 8 - 8
lib/Runtime/PlatformAgnostic/Chakra.Runtime.PlatformAgnostic.vcxproj

@@ -38,17 +38,17 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="RuntimePlatformAgnosticPch.cpp">
+    <ClCompile Include="$(MSBuildThisFileDirectory)RuntimePlatformAgnosticPch.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="Platform\Windows\DateTime.cpp" />
-    <ClCompile Include="Platform\Windows\DaylightHelper.cpp" />
-    <ClCompile Include="Platform\Windows\HiResTimer.cpp" />
-    <ClCompile Include="Platform\Windows\UnicodeText.cpp" />
-    <ClCompile Include="Platform\Windows\NumbersUtility.cpp" />
-    <ClCompile Include="Platform\Windows\SystemInfo.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)Platform\Windows\DateTime.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)Platform\Windows\DaylightHelper.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)Platform\Windows\HiResTimer.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)Platform\Windows\UnicodeText.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)Platform\Windows\NumbersUtility.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)Platform\Windows\SystemInfo.cpp" />
 
-    <ClCompile Include="Platform\Common\UnicodeText.Common.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)Platform\Common\UnicodeText.Common.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="ChakraPlatform.h" />