Skip to content

Simplify VCXProj and add Static Runtime configurations#24

Merged
robertos merged 3 commits into
microsoft:masterfrom
benbuzbee:benbuz/vcxprojcleanup
Apr 26, 2018
Merged

Simplify VCXProj and add Static Runtime configurations#24
robertos merged 3 commits into
microsoft:masterfrom
benbuzbee:benbuz/vcxprojcleanup

Conversation

@benbuzbee
Copy link
Copy Markdown
Contributor

Simplifies the VCXProj by replacing Visual Studio's auto-generated properties with a single source of truth and configuration/platform specific overrides.

Also adds the "Static Library" configuration variant to support consumers who want to link the C Runtime statically in their products.

Comment thread glTF-Toolkit/glTF-Toolkit.vcxproj Outdated
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM">
<Configuration>Release</Configuration>
<Configuration>Release Static Runtime</Configuration>
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think these should be the not static ones?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm not sure what happened there. I'll fix and re-test compilations

Comment thread glTF-Toolkit/glTF-Toolkit.vcxproj Outdated
<IntDir>$(SolutionDir)Built\Int\$(PlatformToolset)\$(Platform)\$(Configuration)\$(MSBuildProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PropertyGroup>
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Configuration == Release or Release Static Runtime

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The intention was to provide default values and overwrite them for debug, like with the ClCompile group, however I can make this change if you prefer

@@ -2,27 +2,51 @@
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're missing the Solution file change that incorporates these new configs.

@robertos
Copy link
Copy Markdown
Contributor

OK to merge as soon as the appveyor build/tests succeeds

@robertos robertos merged commit f635629 into microsoft:master Apr 26, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants