Skip to content

Commit

Permalink
Compilation fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
codereader committed Jul 23, 2024
1 parent 2365ced commit 0ccecc0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion plugins/vcs/Repository.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ void Repository::createCommit(const CommitMetadata& metadata, const Reference::P
// Add all working copy changes
index->updateAll();
auto tree = index->writeTree(*this);
std::vector<git_commit*> parentCommits;
std::vector<const git_commit*> parentCommits;

// It's possible that there is no HEAD yet (first commit in the repo)
if (head)
Expand Down
2 changes: 1 addition & 1 deletion tools/msvc/properties/DarkRadiant Base.props
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(DarkRadiantRoot)\include;$(DarkRadiantRoot)\libs;$(WinDepsDir)libsigc++\include;$(DarkRadiantRoot)\libs\libfmt;$(WinDepsDir)libeigen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(DarkRadiantRoot)\include;$(DarkRadiantRoot)\libs;$(WinDepsDir)libsigc++\include;$(DarkRadiantRoot)\libs\libfmt;$(DarkRadiantRoot)\libs\pugixml;$(WinDepsDir)libeigen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;FMT_HEADER_ONLY;FMT_USE_WINDOWS_H=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
Expand Down

0 comments on commit 0ccecc0

Please sign in to comment.