Update dependencies (#25)

This commit is contained in:
Peter Johnson
2019-01-02 20:33:28 -08:00
committed by GitHub
parent c6a2a7a326
commit d0a2bf8deb
5 changed files with 4 additions and 5 deletions
+1 -1
View File
@@ -5,7 +5,7 @@ pushd 01-download
# raspbian toolchain # raspbian toolchain
wget -nc -nv \ wget -nc -nv \
https://github.com/wpilibsuite/raspbian-toolchain/releases/download/v1.1.0/Raspbian9-Linux-Toolchain-6.3.0.tar.gz https://github.com/wpilibsuite/raspbian-toolchain/releases/download/v1.2.0/Raspbian9-Linux-Toolchain-6.3.0.tar.gz
# openjdk binaries # openjdk binaries
wget -nc -nv \ wget -nc -nv \
-1
View File
@@ -36,7 +36,6 @@ sed -i -e 's/javac sourcepath/javac target="1.8" source="1.8" sourcepath/' openc
# toolchain setup for opencv and wpilib # toolchain setup for opencv and wpilib
cp ../arm-pi-gnueabihf.toolchain.cmake . cp ../arm-pi-gnueabihf.toolchain.cmake .
cp -R ../thirdparty-opencv/jni .
tar xzf ../01-download/jdk_11*.tar.gz jdk/include tar xzf ../01-download/jdk_11*.tar.gz jdk/include
mkdir -p cmake-modules mkdir -p cmake-modules
cat > cmake-modules/FindJNI.cmake << EOF cat > cmake-modules/FindJNI.cmake << EOF
+1 -1