Skip to content

Upgraded Assimp to 6.0 #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Unarmed1000 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgraded Assimp to 6.0 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ThirdParty/Assimp/Fsl.gen
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Default.Platform.Supported Value="false"/>
<Define Name="FSL_ENABLE_ASSIMP" Access="Public"/>
<Platform Name="Android;QNX;Ubuntu;Windows" Supported="true">
<Dependency Name="Recipe.assimp_5_4"/>
<Dependency Name="Recipe.assimp_6_0"/>
</Platform>
<Platform Name="Yocto" Supported="true">
<ExternalDependency Name="assimp" Type="StaticLib"/>
Expand Down
0 ThirdParty/Recipe/assimp_5_4/.gitignore → ThirdParty/Recipe/assimp_6_0/.gitignore
View file
Open in desktop
File renamed without changes.
20 changes: 10 additions & 10 deletions ThirdParty/Recipe/assimp_5_4/Fsl.gen → ThirdParty/Recipe/assimp_6_0/Fsl.gen
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<FslBuildGen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../FslBuildGen.xsd">
<ExternalLibrary Name="Recipe.assimp_5_4" CreationYear="2019">
<ExternalLibrary Name="Recipe.assimp_6_0" CreationYear="2019">
<Default.Platform.Supported Value="false"/>

<Platform Name="Android" Supported="true">
<!--Dependency Name="zlib"/-->
<!-- Find is disabled due to a error in the assimp recipe -->
<ExperimentalRecipe Name="assimp" Version="5.4" Find="false" FindVersion="5.0">
<ExperimentalRecipe Name="assimp" Version="6.0" Find="false" FindVersion="6.0">
<Pipeline>
<Download URL="https://github.com/assimp/assimp/archive/v5.4.3.tar.gz" To="assimp-5.4.3.tar.gz" Hash="66dfbaee288f2bc43172440a55d0235dfc7bf885dda6435c038e8000e79582cb"/>
<Unpack File="assimp-5.4.3.tar.gz" OutputPath="assimp-5.4.3"/>
<Download URL="https://github.com/assimp/assimp/archive/v6.0.2.tar.gz" To="assimp-6.0.2.tar.gz" Hash="d1822d9a19c9205d6e8bc533bf897174ddb360ce504680f294170cc1d6319751"/>
<Unpack File="assimp-6.0.2.tar.gz" OutputPath="assimp-6.0.2"/>
<!-- We use a workaround to build this -->
<CMakeBuild Project="Assimp" Target="install" Configuration="release" Options="-DBUILD_SHARED_LIBS=OFF -DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DASSIMP_BUILD_TESTS=OFF -DASSIMP_WARNINGS_AS_ERRORS=OFF -DASSIMP_BUILD_ZLIB=ON" OutputPath="_Install"/>
</Pipeline>
Expand All @@ -28,10 +28,10 @@
<Platform Name="Ubuntu;QNX" Supported="true">
<Dependency Name="zlib"/>
<!-- Find is disabled due to a error in the assimp recipe -->
<ExperimentalRecipe Name="assimp" Version="5.4.3" Find="false" FindVersion="5.0">
<ExperimentalRecipe Name="assimp" Version="6.0.2" Find="false" FindVersion="6.0">
<Pipeline>
<Download URL="https://github.com/assimp/assimp/archive/v5.4.3.tar.gz" To="assimp-5.4.3.tar.gz" Hash="66dfbaee288f2bc43172440a55d0235dfc7bf885dda6435c038e8000e79582cb"/>
<Unpack File="assimp-5.4.3.tar.gz" OutputPath="assimp-5.4.3"/>
<Download URL="https://github.com/assimp/assimp/archive/v6.0.2.tar.gz" To="assimp-6.0.2.tar.gz" Hash="d1822d9a19c9205d6e8bc533bf897174ddb360ce504680f294170cc1d6319751"/>
<Unpack File="assimp-6.0.2.tar.gz" OutputPath="assimp-6.0.2"/>
<CMakeBuild Project="Assimp" Target="install" Configuration="release" Options="-DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DASSIMP_BUILD_TESTS=OFF -DASSIMP_WARNINGS_AS_ERRORS=OFF" OutputPath="_Install"/>
</Pipeline>
<Installation>
Expand All @@ -47,10 +47,10 @@
<Platform Name="Windows" Supported="true">
<Dependency Name="zlib"/>
<!-- Find is disabled due to a error in the assimp recipe -->
<ExperimentalRecipe Name="assimp" Version="5.4.3" Find="false" FindVersion="5.2">
<ExperimentalRecipe Name="assimp" Version="6.0.2" Find="false" FindVersion="5.2">
<Pipeline>
<Download URL="https://github.com/assimp/assimp/archive/v5.4.3.tar.gz" To="assimp-5.4.3.tar.gz" Hash="66dfbaee288f2bc43172440a55d0235dfc7bf885dda6435c038e8000e79582cb"/>
<Unpack File="assimp-5.4.3.tar.gz" OutputPath="assimp-5.4.3"/>
<Download URL="https://github.com/assimp/assimp/archive/v6.0.2.tar.gz" To="assimp-6.0.2.tar.gz" Hash="d1822d9a19c9205d6e8bc533bf897174ddb360ce504680f294170cc1d6319751"/>
<Unpack File="assimp-6.0.2.tar.gz" OutputPath="assimp-6.0.2"/>
<CMakeBuild Project="Assimp" Target="install" Configuration="release" Options="-DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DASSIMP_BUILD_TESTS=OFF -DASSIMP_WARNINGS_AS_ERRORS=OFF" OutputPath="_Install"/>
</Pipeline>
<Installation>
Expand Down