File tree Expand file tree Collapse file tree 5 files changed +38
-8
lines changed Expand file tree Collapse file tree 5 files changed +38
-8
lines changed Original file line number Diff line number Diff line change 1
1
os :
2
2
- linux
3
+ - osx
3
4
4
5
language : cpp
5
6
@@ -10,14 +11,15 @@ compiler:
10
11
before_script :
11
12
- date -u
12
13
- uname -a
13
- - lsb_release -a
14
- - ln -s tools/scons.travis.cfg scons.cfg
15
- - sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty main restricted universe multiverse"
16
- - sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse"
17
- - sudo apt-add-repository "deb http://security.ubuntu.com/ubuntu trusty-security main restricted universe multiverse"
18
- - sudo apt-get update -qq
19
- - sudo apt-get install -qq gcc g++ scons swig swig2.0
20
- - sudo apt-get install -qq libavdevice-dev libavformat-dev libavcodec-dev libavutil-dev libswscale-dev libavresample-dev python-dev freeglut3-dev doxygen
14
+ - env | sort
15
+
16
+ - chmod +x tools/CI/travis.linux.install.deps.sh
17
+ - chmod +x tools/CI/travis.osx.install.deps.sh
18
+ - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./tools/CI/travis.linux.install.deps.sh; fi
19
+ - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then tools/CI/travis.osx.install.deps.sh; fi
20
+
21
+ - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ln -s tools/scons.travis.linux.cfg scons.cfg; fi
22
+ - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then ln -s tools/scons.travis.osx.cfg scons.cfg; fi
21
23
22
24
script :
23
25
- scons
Original file line number Diff line number Diff line change
1
+ #! /bin/bash
2
+
3
+ lsb_release -a
4
+
5
+ sudo apt-add-repository " deb http://archive.ubuntu.com/ubuntu trusty main restricted universe multiverse"
6
+ sudo apt-add-repository " deb http://archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse"
7
+ sudo apt-add-repository " deb http://security.ubuntu.com/ubuntu trusty-security main restricted universe multiverse"
8
+ sudo apt-get update -qq
9
+ sudo apt-get install -qq gcc g++ scons swig swig2.0
10
+ sudo apt-get install -qq libavdevice-dev libavformat-dev libavcodec-dev libavutil-dev libswscale-dev libavresample-dev python-dev freeglut3-dev doxygen
Original file line number Diff line number Diff line change
1
+ #! /bin/bash
2
+
3
+ brew update
4
+
5
+ brew install gcc scons swig
6
+ brew install ffmpeg freeglut doxygen
File renamed without changes.
Original file line number Diff line number Diff line change
1
+ [COMMON]
2
+
3
+ [PYTHON]
4
+ inc =/usr/include/python2.7/
5
+
6
+ [JAVA]
7
+ inc =/usr/lib/jvm/java-7-openjdk-amd64/include; /usr/lib/jvm/java-7-openjdk-amd64/include/linux/
8
+
9
+ [LIBAV]
10
+ inc =/usr/local/Cellar/ffmpeg/2.3.2/include/
11
+ libdir =/usr/local/Cellar/ffmpeg/2.3.2/lib/
12
+
You can’t perform that action at this time.
0 commit comments