Skip to content

Commit

Permalink
Merge remote tracking branch upstream/dev into feature/MHK_AddedMass_…
Browse files Browse the repository at this point in the history
…Inertia
  • Loading branch information
hkross committed Dec 10, 2024
2 parents 4284409 + 3dbbf56 commit f9fbbcd
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion vs-build/MAPlib/MAP_dll.vcxproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
Expand Down Expand Up @@ -75,6 +75,7 @@
<TargetName>MAP_$(PlatformName)</TargetName>
<LinkIncremental>true</LinkIncremental>
<OutDir>..\..\build\bin\</OutDir>
<IntDir>$(PlatformName)\$(ConfigurationName)</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
Expand All @@ -85,6 +86,7 @@
<TargetName>MAP_$(PlatformName)</TargetName>
<LinkIncremental>false</LinkIncremental>
<OutDir>..\..\build\bin\</OutDir>
<IntDir>$(PlatformName)\$(ConfigurationName)</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
Expand Down

0 comments on commit f9fbbcd

Please sign in to comment.