mirror of
				https://github.com/vcmi/vcmi.git
				synced 2025-10-31 00:07:39 +02:00 
			
		
		
		
	Merge pull request #43 from Mixaill/travis-test
Merged for Ivan's request.
This commit is contained in:
		
							
								
								
									
										12
									
								
								.travis.yml
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								.travis.yml
									
									
									
									
									
								
							| @@ -10,7 +10,7 @@ before_install: | ||||
|   #new SDL2 | ||||
|   - sudo add-apt-repository --yes ppa:zoogie/sdl2-snapshots | ||||
|   #new Qt | ||||
|   - sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa | ||||
|   - sudo add-apt-repository --yes ppa:beineri/opt-qt532 | ||||
|   #new FFmpeg | ||||
|   - sudo add-apt-repository --yes ppa:djcj/vlc-stable | ||||
|   #new CMake | ||||
| @@ -20,13 +20,13 @@ before_install: | ||||
|  | ||||
|   - sudo apt-get install -qq $SUPPORT | ||||
|   - sudo apt-get install -qq $PACKAGE | ||||
|   - sudo apt-get install -qq cmake yasm libboost1.55-all-dev zlib1g-dev | ||||
|   - sudo apt-get install -qq cmake libboost1.55-all-dev zlib1g-dev | ||||
|   - sudo apt-get install -qq libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev | ||||
|   - sudo apt-get install -qq libavformat-dev libswscale-dev | ||||
|   - sudo apt-get install -qq qtdeclarative5-dev | ||||
|   - sudo apt-get install -qq qt53declarative | ||||
|    | ||||
|   #setup compiler | ||||
|   #- source /opt/qt53/bin/qt53-env.sh | ||||
|   - source /opt/qt53/bin/qt53-env.sh | ||||
|   - export CC=${REAL_CC} CXX=${REAL_CXX} | ||||
|  | ||||
| before_script: | ||||
| @@ -44,8 +44,8 @@ matrix: | ||||
|   exclude: | ||||
|     - env: ignore=this | ||||
|   include: | ||||
|     #- compiler: clang # fails all the time - missing packages? | ||||
|     #  env: REAL_CC=clang-3.2 REAL_CXX=clang++-3.2 PACKAGE=clang-3.2 SUPPORT=g++-4.8  | ||||
|     - compiler: clang # fails all the time - missing packages? | ||||
|       env: REAL_CC=clang-3.2 REAL_CXX=clang++-3.2 PACKAGE=clang-3.2 SUPPORT=g++-4.8  | ||||
|     - compiler: clang | ||||
|       env: REAL_CC=clang-3.3 REAL_CXX=clang++-3.3 PACKAGE=clang-3.3 SUPPORT=g++-4.8  | ||||
|     - compiler: clang | ||||
|   | ||||
		Reference in New Issue
	
	Block a user