Commit 3f018f68 authored by IOhannes m zmoelnig's avatar IOhannes m zmoelnig

Merge branch 'master' into videoVIDS

parents 3825da36 f3b7e066
...@@ -84,7 +84,7 @@ variables: ...@@ -84,7 +84,7 @@ variables:
- rm -f Pd.zip - rm -f Pd.zip
- rm -f _pd/bin/msvcr*.dll - rm -f _pd/bin/msvcr*.dll
- export PD="_pd/bin/pd.com" - export PD="_pd/bin/pd.com"
- pacman --noconfirm -S $(cat .git-ci/msys2.pacman | sed -e 's|#.*||' -e "s|@MINGW@|${MINGW_PACKAGE_PREFIX}-|") - pacman --noconfirm -S --needed $(cat .git-ci/msys2.pacman | sed -e 's|#.*||' -e "s|@MINGW@|${MINGW_PACKAGE_PREFIX}-|")
- date - date
- g++ -v - g++ -v
script: script:
...@@ -110,7 +110,7 @@ variables: ...@@ -110,7 +110,7 @@ variables:
- rm -f Pd.zip - rm -f Pd.zip
- rm -f _pd/bin/msvcr*.dll - rm -f _pd/bin/msvcr*.dll
- export PD="_pd/bin/pd.com" - export PD="_pd/bin/pd.com"
- pacman --noconfirm -S $(cat .git-ci/msys2.pacman | sed -e 's|#.*||' -e "s|@MINGW@|${MINGW_PACKAGE_PREFIX}-|") - pacman --noconfirm -S --needed $(cat .git-ci/msys2.pacman | sed -e 's|#.*||' -e "s|@MINGW@|${MINGW_PACKAGE_PREFIX}-|")
- date - date
- g++ -v - g++ -v
script: script:
......
# basic building infrastructure
@MINGW@gcc
@MINGW@libtool
autotools
automake
make
@MINGW@pkg-config
# model loading # model loading
@MINGW@assimp @MINGW@assimp
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment