Skip to content

Commit

Permalink
Fix for the ubuntu build failures.
Browse files Browse the repository at this point in the history
  • Loading branch information
akroshg committed Jul 6, 2016
1 parent 9a83c31 commit 36caddf
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
2 changes: 2 additions & 0 deletions bin/ch/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ add_executable (ch
CodexAssert.cpp
Debugger.cpp
Helpers.cpp
../FileLoadHelpers/FileLoadHelpers.cpp
HostConfigFlags.cpp
WScriptJsrt.cpp
)
Expand All @@ -18,6 +19,7 @@ include_directories(..)
target_include_directories (ch
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
../ChakraCore
../FileLoadHelpers
../../lib/Common
../../lib/Jsrt
)
Expand Down
8 changes: 4 additions & 4 deletions bin/ch/ch.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
$(MSBuildThisFileDirectory);
$(ChakraCoreRootDirectory)Lib\Common;
$(ChakraCoreRootDirectory)Bin\ChakraCore;
$(ChakraCoreRootDirectory)bin\fileloadhelpers;
$(ChakraCoreRootDirectory)bin\FileLoadHelpers;
$(IntDir);
%(AdditionalIncludeDirectories);
</AdditionalIncludeDirectories>
Expand All @@ -44,13 +44,13 @@
<ResourceCompile Include="$(MsBuildThisFileDirectory)ch.rc">
<AdditionalIncludeDirectories>
$(ChakraCoreRootDirectory)lib\common;
$(ChakraCoreRootDirectory)bin\fileloadhelpers;
$(ChakraCoreRootDirectory)bin\FileLoadHelpers;
%(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\fileloadhelpers\FileLoadHelpers.h" />
<ClInclude Include="..\FileLoadHelpers\FileLoadHelpers.h" />
<ClInclude Include="ChakraRtInterface.h" />
<ClInclude Include="Debugger.h" />
<ClInclude Include="Helpers.h" />
Expand All @@ -61,7 +61,7 @@
<ClInclude Include="WScriptJsrt.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\fileloadhelpers\FileLoadHelpers.cpp" />
<ClCompile Include="..\FileLoadHelpers\FileLoadHelpers.cpp" />
<ClCompile Include="ch.cpp" />
<ClCompile Include="ChakraRtInterface.cpp" />
<ClCompile Include="CodexAssert.cpp" />
Expand Down
6 changes: 3 additions & 3 deletions bin/nativetests/nativetests.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
$(MSBuildThisFileDirectory);
$(ChakraCoreRootDirectory)Lib\Common;
$(ChakraCoreRootDirectory)bin\External;
$(ChakraCoreRootDirectory)bin\fileloadhelpers;
$(ChakraCoreRootDirectory)bin\FileLoadHelpers;
%(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories>
<RuntimeLibrary Condition="'$(Configuration)'=='Debug'">MultiThreadedDebugDLL</RuntimeLibrary>
Expand All @@ -40,11 +40,11 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\External\catch.hpp" />
<ClInclude Include="..\fileloadhelpers\FileLoadHelpers.h" />
<ClInclude Include="..\FileLoadHelpers\FileLoadHelpers.h" />
<ClInclude Include="stdafx.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\fileloadhelpers\FileLoadHelpers.cpp" />
<ClCompile Include="..\FileLoadHelpers\FileLoadHelpers.cpp" />
<ClCompile Include="CodexAssert.cpp" />
<ClCompile Include="JsRTApiTest.cpp" />
<ClCompile Include="MemoryPolicyTest.cpp" />
Expand Down

0 comments on commit 36caddf

Please sign in to comment.