Skip to content

Commit

Permalink
Rename Windows and Linux dependency repositories
Browse files Browse the repository at this point in the history
appleseed-deps -> windows-deps
prebuilt-linux-deps -> linux-deps
  • Loading branch information
dictoon authored and est77 committed May 18, 2019
1 parent 2471e02 commit 074ffa7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ for:

install:
- cmd: |
appveyor DownloadFile https://github.com/appleseedhq/appleseed-deps/releases/download/%AppleseedDepsVersion%/appleseed-deps-stage-win64-%CompilerId%-%AppleseedDepsVersion%.zip
7z x appleseed-deps-stage-win64-%CompilerId%-%AppleseedDepsVersion%.zip -oappleseed-deps
appveyor DownloadFile https://github.com/appleseedhq/windows-deps/releases/download/%AppleseedDepsVersion%/appleseed-deps-stage-win64-%CompilerId%-%AppleseedDepsVersion%.zip
7z x appleseed-deps-stage-win64-%CompilerId%-%AppleseedDepsVersion%.zip -owindows-deps
rm appleseed-deps-stage-win64-%CompilerId%-%AppleseedDepsVersion%.zip
appveyor DownloadFile https://github.com/appleseedhq/appveyor-deps/releases/download/%AppVeyorDepsVersion%/boost_%BoostVersion%_%CompilerId%.zip
Expand All @@ -78,7 +78,7 @@ before_build:
- cmd: |
mkdir build
cd build
cmake -Wno-dev -G "%CMakeGenerator%" -DWITH_DISNEY_MATERIAL=ON -DWITH_EMBREE=ON -DWITH_STUDIO=OFF -DWITH_PYTHON3_BINDINGS=ON -DUSE_SSE42=ON -DBOOST_ROOT=C:\projects\appleseed\boost_%BoostVersion%_%CompilerId% -DPYTHON_INCLUDE_DIR=C:\Python27-x64\include -DPYTHON_LIBRARY=C:\Python27-x64\libs\python27.lib -DPYTHON3_INCLUDE_DIR=C:\Python35-x64\include -DPYTHON3_LIBRARY=C:\Python35-x64\libs\python35.lib -DAPPLESEED_DEPS_STAGE_DIR=C:\projects\appleseed\appleseed-deps\stage\%CompilerId% ..
cmake -Wno-dev -G "%CMakeGenerator%" -DWITH_DISNEY_MATERIAL=ON -DWITH_EMBREE=ON -DWITH_STUDIO=OFF -DWITH_PYTHON3_BINDINGS=ON -DUSE_SSE42=ON -DBOOST_ROOT=C:\projects\appleseed\boost_%BoostVersion%_%CompilerId% -DPYTHON_INCLUDE_DIR=C:\Python27-x64\include -DPYTHON_LIBRARY=C:\Python27-x64\libs\python27.lib -DPYTHON3_INCLUDE_DIR=C:\Python35-x64\include -DPYTHON3_LIBRARY=C:\Python35-x64\libs\python35.lib -DAPPLESEED_DEPS_STAGE_DIR=C:\projects\appleseed\windows-deps\stage\%CompilerId% ..
build:
project: build\appleseed.sln
Expand Down
2 changes: 1 addition & 1 deletion scripts/travis/build-linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ THISDIR=`pwd`
echo "travis_fold:start:deps"
echo "Downloading and unpacking dependencies..."

curl -L "https://github.com/appleseedhq/prebuilt-linux-deps/releases/download/v2.1/appleseed-deps-shared-2.1.tgz" > deps.tgz
curl -L "https://github.com/appleseedhq/linux-deps/releases/download/v2.1/appleseed-deps-shared-2.1.tgz" > deps.tgz
tar xfz deps.tgz
rm deps.tgz

Expand Down

0 comments on commit 074ffa7

Please sign in to comment.