Merge pull request #1 from zellski/FreakTheMighty-feature/docker

The Dockerfile can tell Conan exactly what its system is.
This commit is contained in:
Jesse Vander Does 2019-05-07 17:12:53 -07:00 committed by GitHub
commit 0987bb56ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions

View File

@ -21,8 +21,8 @@ RUN curl -L https://www.autodesk.com/content/dam/autodesk/www/adn/fbx/20192/fbx2
rm -rf /fbxsdktemp
# Build and install
RUN conan install . -i build -s build_type=Release -e FBXSDK_SDKS=/fbx2gltf/sdk && \
conan build -bf build . && \
cp build/FBX2glTF /usr/bin && \
RUN conan install . -i docker-build -s build_type=Release -s compiler=gcc -s compiler.version=5 -s compiler.libcxx=libstdc++11 && \
conan build -bf docker-build . && \
cp docker-build/FBX2glTF /usr/bin && \
cd / && \
rm -rf /fbx2gltf
rm -rf /fbx2gltf /root/.conan