Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 05ed8f869270
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5cf0c5b65361
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Jun 6, 2021

  1. Adjust glog paths.

    pleroy committed Jun 6, 2021
    Copy the full SHA
    36c4b9a View commit details
  2. Merge pull request #3027 from pleroy/Glog

    Adjust glog paths
    pleroy authored Jun 6, 2021
    Copy the full SHA
    5cf0c5b View commit details
Showing with 6 additions and 6 deletions.
  1. +3 −3 google_glog.props
  2. +2 −2 principia.props
  3. +1 −1 rebuild_all_solutions.ps1
6 changes: 3 additions & 3 deletions google_glog.props
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 2 additions & 2 deletions principia.props
Original file line number Diff line number Diff line change
@@ -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)"
2 changes: 1 addition & 1 deletion rebuild_all_solutions.ps1
Original file line number Diff line number Diff line change
@@ -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",