#5662: Adjust vcs build settings to correspond to the changes done to…

… the winbuild repository
codereader · Jul 26, 2021 · b7bcbb8 · b7bcbb8
1 parent eea0c0b
commit b7bcbb8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/plugins/vcs/ui/VcsStatus.cpp b/plugins/vcs/ui/VcsStatus.cpp
@@ -276,13 +276,15 @@ void VcsStatus::updateMapFileStatus()
         return;
     }
 
-    _mapStatus->SetLabel(_("Map is saved"));
-
     if (_repository)
     {
         auto repository = _repository->clone();
         _mapFileTask = std::async(std::launch::async, std::bind(&VcsStatus::performMapFileStatusCheck, this, repository));
     }
+    else
+    {
+        _mapStatus->SetLabel(_("Map is saved"));
+    }
 }
 
 void VcsStatus::onIdle(wxIdleEvent& ev)

diff --git a/tools/msvc/DarkRadiant.sln b/tools/msvc/DarkRadiant.sln
@@ -117,6 +117,9 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DependencyCheck", "..\DependencyCheck\DependencyCheck.vcxproj", "{0D4BE190-97F4-4DB9-BEAB-B0196868EC0A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vcs", "vcs.vcxproj", "{6591C1E2-6BCF-4874-B724-CC87B8AA0DA4}"
+	ProjectSection(ProjectDependencies) = postProject
+		{0D4BE190-97F4-4DB9-BEAB-B0196868EC0A} = {0D4BE190-97F4-4DB9-BEAB-B0196868EC0A}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/tools/msvc/post_build_event_x64.cmd b/tools/msvc/post_build_event_x64.cmd
@@ -2,7 +2,6 @@ for %%i in (..\..\install\*.dll) do if not "%%~nxi"=="DarkRadiantCore.dll" del "
 
 del ..\..\install\python*.zip
 
-copy ..\..\w64deps\libgit2\bin\git2.dll ..\..\install /Y
 copy ..\..\w64deps\openal\bin\OpenAL32.dll ..\..\install /Y
 copy ..\..\w64deps\openal\bin\wrap_oal.dll ..\..\install /Y
 copy ..\..\w64deps\glew\bin\glew32.dll ..\..\install /Y
@@ -35,4 +34,7 @@ copy ..\..\w64deps\ftgl\bin\ftgl%DEBUG_SUFFIX%-%2.dll ..\..\install /Y
 copy "..\..\w64deps\libsigc++\bin\libsigc++%DEBUG_SUFFIX%-%2.dll" ..\..\install /Y
 
 @echo Copying libxml2 library (64 bit)
-copy ..\..\w64deps\libxml2\bin\libxml2%DEBUG_SUFFIX%-%2.dll ..\..\install /Y
+copy ..\..\w64deps\libxml2\bin\libxml2%DEBUG_SUFFIX%-%2.dll ..\..\install /Y
+
+@echo Copying libgit2 library (64-bit)
+copy ..\..\w64deps\libgit2\bin\libgit2%DEBUG_SUFFIX%.dll ..\..\install /Y
diff --git a/tools/msvc/properties/libgit2.props b/tools/msvc/properties/libgit2.props
@@ -8,7 +8,7 @@
       <AdditionalIncludeDirectories>$(W32DepsDir)libgit2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>git2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libgit2$(LibSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(PlatformDepsDir)\libgit2\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>