Skip to content

Commit

Permalink
November 11, 2020
Browse files Browse the repository at this point in the history
  • Loading branch information
@walbourn
walbourn committed Nov 14, 2020
1 parent 02ae846 commit a7368f8
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 24 deletions.
9 changes: 0 additions & 9 deletions ContentExporter_2017.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,32 +13,23 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Profile|x64 = Profile|x64
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{A831840E-93D9-48E4-866C-1F024B3D44FC}.Debug|x64.ActiveCfg = Debug|x64
{A831840E-93D9-48E4-866C-1F024B3D44FC}.Debug|x64.Build.0 = Debug|x64
{A831840E-93D9-48E4-866C-1F024B3D44FC}.Profile|x64.ActiveCfg = Release|x64
{A831840E-93D9-48E4-866C-1F024B3D44FC}.Profile|x64.Build.0 = Release|x64
{A831840E-93D9-48E4-866C-1F024B3D44FC}.Release|x64.ActiveCfg = Release|x64
{A831840E-93D9-48E4-866C-1F024B3D44FC}.Release|x64.Build.0 = Release|x64
{6AFA24FB-37B3-49D3-9832-F7EA3DE3CA2E}.Debug|x64.ActiveCfg = Debug|x64
{6AFA24FB-37B3-49D3-9832-F7EA3DE3CA2E}.Debug|x64.Build.0 = Debug|x64
{6AFA24FB-37B3-49D3-9832-F7EA3DE3CA2E}.Profile|x64.ActiveCfg = Release|x64
{6AFA24FB-37B3-49D3-9832-F7EA3DE3CA2E}.Profile|x64.Build.0 = Release|x64
{6AFA24FB-37B3-49D3-9832-F7EA3DE3CA2E}.Release|x64.ActiveCfg = Release|x64
{6AFA24FB-37B3-49D3-9832-F7EA3DE3CA2E}.Release|x64.Build.0 = Release|x64
{3F3D7892-A3F4-43A9-87BF-B9C28E9069E8}.Debug|x64.ActiveCfg = Debug|x64
{3F3D7892-A3F4-43A9-87BF-B9C28E9069E8}.Debug|x64.Build.0 = Debug|x64
{3F3D7892-A3F4-43A9-87BF-B9C28E9069E8}.Profile|x64.ActiveCfg = Release|x64
{3F3D7892-A3F4-43A9-87BF-B9C28E9069E8}.Profile|x64.Build.0 = Release|x64
{3F3D7892-A3F4-43A9-87BF-B9C28E9069E8}.Release|x64.ActiveCfg = Release|x64
{3F3D7892-A3F4-43A9-87BF-B9C28E9069E8}.Release|x64.Build.0 = Release|x64
{85495119-FC0E-4F85-8357-8823B6164F9E}.Debug|x64.ActiveCfg = Debug|x64
{85495119-FC0E-4F85-8357-8823B6164F9E}.Debug|x64.Build.0 = Debug|x64
{85495119-FC0E-4F85-8357-8823B6164F9E}.Profile|x64.ActiveCfg = Release|x64
{85495119-FC0E-4F85-8357-8823B6164F9E}.Profile|x64.Build.0 = Release|x64
{85495119-FC0E-4F85-8357-8823B6164F9E}.Release|x64.ActiveCfg = Release|x64
{85495119-FC0E-4F85-8357-8823B6164F9E}.Release|x64.Build.0 = Release|x64
EndGlobalSection
Expand Down
9 changes: 0 additions & 9 deletions ContentExporter_2019.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,32 +13,23 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Profile|x64 = Profile|x64
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{A831840E-93D9-48E4-866C-1F024B3D44FC}.Debug|x64.ActiveCfg = Debug|x64
{A831840E-93D9-48E4-866C-1F024B3D44FC}.Debug|x64.Build.0 = Debug|x64
{A831840E-93D9-48E4-866C-1F024B3D44FC}.Profile|x64.ActiveCfg = Release|x64
{A831840E-93D9-48E4-866C-1F024B3D44FC}.Profile|x64.Build.0 = Release|x64
{A831840E-93D9-48E4-866C-1F024B3D44FC}.Release|x64.ActiveCfg = Release|x64
{A831840E-93D9-48E4-866C-1F024B3D44FC}.Release|x64.Build.0 = Release|x64
{6AFA24FB-37B3-49D3-9832-F7EA3DE3CA2E}.Debug|x64.ActiveCfg = Debug|x64
{6AFA24FB-37B3-49D3-9832-F7EA3DE3CA2E}.Debug|x64.Build.0 = Debug|x64
{6AFA24FB-37B3-49D3-9832-F7EA3DE3CA2E}.Profile|x64.ActiveCfg = Release|x64
{6AFA24FB-37B3-49D3-9832-F7EA3DE3CA2E}.Profile|x64.Build.0 = Release|x64
{6AFA24FB-37B3-49D3-9832-F7EA3DE3CA2E}.Release|x64.ActiveCfg = Release|x64
{6AFA24FB-37B3-49D3-9832-F7EA3DE3CA2E}.Release|x64.Build.0 = Release|x64
{3F3D7892-A3F4-43A9-87BF-B9C28E9069E8}.Debug|x64.ActiveCfg = Debug|x64
{3F3D7892-A3F4-43A9-87BF-B9C28E9069E8}.Debug|x64.Build.0 = Debug|x64
{3F3D7892-A3F4-43A9-87BF-B9C28E9069E8}.Profile|x64.ActiveCfg = Release|x64
{3F3D7892-A3F4-43A9-87BF-B9C28E9069E8}.Profile|x64.Build.0 = Release|x64
{3F3D7892-A3F4-43A9-87BF-B9C28E9069E8}.Release|x64.ActiveCfg = Release|x64
{3F3D7892-A3F4-43A9-87BF-B9C28E9069E8}.Release|x64.Build.0 = Release|x64
{85495119-FC0E-4F85-8357-8823B6164F9E}.Debug|x64.ActiveCfg = Debug|x64
{85495119-FC0E-4F85-8357-8823B6164F9E}.Debug|x64.Build.0 = Debug|x64
{85495119-FC0E-4F85-8357-8823B6164F9E}.Profile|x64.ActiveCfg = Release|x64
{85495119-FC0E-4F85-8357-8823B6164F9E}.Profile|x64.Build.0 = Release|x64
{85495119-FC0E-4F85-8357-8823B6164F9E}.Release|x64.ActiveCfg = Release|x64
{85495119-FC0E-4F85-8357-8823B6164F9E}.Release|x64.Build.0 = Release|x64
EndGlobalSection
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ http://go.microsoft.com/fwlink/?LinkId=226208

Copyright (c) Microsoft Corporation. All rights reserved.

**June 1, 2020**
**November 13, 2020**

The **Samples Content Exporter** was shipped as a sample in the legacy DirectX SDK. It makes use of the [Autodesk FBX SDK](http://autodesk.com/fbx) to import an FBX file and then export the data as an ``.SDKMESH``. The ``.SDKMESH`` format is a runtime geometry format supported by the _DirectX Tool Kit_ for [DX11](http://go.microsoft.com/fwlink/?LinkId=248929) / [DX12](http://go.microsoft.com/fwlink/?LinkID=615561) and [DXUT](http://go.microsoft.com/fwlink/?LinkId=320437), and is used in the Windows sample [Marble Maze](https://docs.microsoft.com/en-us/samples/microsoft/windows-appsample-marble-maze/directx-marble-maze-game-sample/).

Expand Down Expand Up @@ -49,7 +49,7 @@ Use of OpenEXR is subject to it's own license terms, and requires the ZLIB libra

## Build Instructions

Install the Autodesk FBX SDK 2019.2 or later (latest tested version is 2020.0) for Windows VS 2017.
Install the Autodesk FBX SDK 2019.2 or later (latest tested version is 2020.1.1) for Windows VS 2017.

http://autodesk.com/fbx

Expand Down
4 changes: 2 additions & 2 deletions importfbx/ImportFBX2017.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<ForceFileOutput>MultiplyDefinedSymbolOnly</ForceFileOutput>
<AdditionalOptions>/IGNORE:4006 %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>/IGNORE:4075 /IGNORE:4099 %(AdditionalOptions)</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
Expand Down Expand Up @@ -120,7 +120,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<ForceFileOutput>MultiplyDefinedSymbolOnly</ForceFileOutput>
<AdditionalOptions>/IGNORE:4006 %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>/IGNORE:4075 /IGNORE:4099 %(AdditionalOptions)</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions importfbx/ImportFBX2019.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<ForceFileOutput>MultiplyDefinedSymbolOnly</ForceFileOutput>
<AdditionalOptions>/IGNORE:4006 %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>/IGNORE:4075 /IGNORE:4099 %(AdditionalOptions)</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
Expand Down Expand Up @@ -120,7 +120,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<ForceFileOutput>MultiplyDefinedSymbolOnly</ForceFileOutput>
<AdditionalOptions>/IGNORE:4006 %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>/IGNORE:4075 /IGNORE:4099 %(AdditionalOptions)</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Expand Down

0 comments on commit a7368f8

Please sign in to comment.