Adjust glog paths.

mockingbirdnest · Jun 6, 2021 · 36c4b9a · 36c4b9a
1 parent 05ed8f8
commit 36c4b9a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/google_glog.props b/google_glog.props
@@ -7,13 +7,13 @@
       <AdditionalIncludeDirectories>$(SolutionDir)..\Google\glog\src\windows;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\Google\glog\$(PrincipiaDependencyConfiguration)\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libglog.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\Google\glog\msvc\$(PrincipiaDependencyConfiguration)\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>glog.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup />
   <Target Name="CopyGlogDll" AfterTargets="Build">
-    <Copy SourceFiles="$(SolutionDir)..\Google\glog\$(PrincipiaDependencyConfiguration)\$(Platform)\libglog.dll"
+    <Copy SourceFiles="$(SolutionDir)..\Google\glog\msvc\$(PrincipiaDependencyConfiguration)\$(Platform)\glog.dll"
           DestinationFolder="$(OutDir)"
           SkipUnchangedFiles="true"/>
   </Target>

diff --git a/principia.props b/principia.props
@@ -150,7 +150,7 @@
   <Import Project="$(SolutionDir)include_solution.props" />
   <Import Project="$(SolutionDir)..\Google\protobuf\vsprojects\portability_macros.props" />
   <Import Project="$(SolutionDir)google_protobuf.props" />
-  <Import Project="$(SolutionDir)..\Google\glog\vsprojects\portability_macros.props" />
+  <Import Project="$(SolutionDir)..\Google\glog\msvc\portability_macros.props" />
   <Import Project="$(SolutionDir)google_glog.props" />
   <Import Project="$(SolutionDir)..\Google\gipfeli\msvc\portability_macros.props" />
   <Import Project="$(SolutionDir)google_gipfeli.props" />
@@ -222,7 +222,7 @@
     <PostBuildEvent>
       <Command>
         if not exist "$(SolutionDir)$(Configuration)\GameData\Principia\$(Platform)" mkdir "$(SolutionDir)$(Configuration)\GameData\Principia\$(Platform)"
-        if exist "$(OutDir)libglog.dll" copy /Y "$(OutDir)libglog.dll" "$(SolutionDir)$(Configuration)\GameData\Principia\$(Platform)"
+        if exist "$(OutDir)glog.dll" copy /Y "$(OutDir)glog.dll" "$(SolutionDir)$(Configuration)\GameData\Principia\$(Platform)"
         if exist "$(OutDir)libprotobuf.dll" copy /Y "$(OutDir)libprotobuf.dll" "$(SolutionDir)$(Configuration)\GameData\Principia\$(Platform)"
         copy /Y "$(TargetPath)" "$(SolutionDir)$(Configuration)\GameData\Principia\$(Platform)"
         copy /Y "$(OutDir)$(TargetName).pdb" "$(SolutionDir)$(Configuration)\GameData\Principia\$(Platform)"

diff --git a/rebuild_all_solutions.ps1 b/rebuild_all_solutions.ps1
@@ -2,7 +2,7 @@ $ErrorActionPreference = "Stop"
 
 $msbuild = &".\Principia\find_msbuild.ps1"
 
-$dependencies = @(".\Google\glog\google-glog.sln",
+$dependencies = @(".\Google\glog\msvc\glog.sln",
                   ".\Google\googletest\googletest\msvc\gtest.sln",
                   ".\Google\googletest\googlemock\msvc\gmock.sln",
                   ".\Google\protobuf\vsprojects\protobuf.sln",