mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-10-30 21:30:04 +00:00 
			
		
		
		
	travis: Compile on macOS 10.13 with more up to date compiler
This commit is contained in:
		
							parent
							
								
									4d7487bd34
								
							
						
					
					
						commit
						1f375f2511
					
				
					 3 changed files with 8 additions and 3 deletions
				
			
		|  | @ -32,7 +32,7 @@ matrix: | ||||||
|     - os: osx |     - os: osx | ||||||
|       env: NAME="macos build" |       env: NAME="macos build" | ||||||
|       sudo: false |       sudo: false | ||||||
|       osx_image: xcode10.2 |       osx_image: xcode10 | ||||||
|       install: "./.travis/macos/deps.sh" |       install: "./.travis/macos/deps.sh" | ||||||
|       script: "./.travis/macos/build.sh" |       script: "./.travis/macos/build.sh" | ||||||
|       after_success: "./.travis/macos/upload.sh" |       after_success: "./.travis/macos/upload.sh" | ||||||
|  |  | ||||||
|  | @ -4,7 +4,12 @@ set -o pipefail | ||||||
| 
 | 
 | ||||||
| export MACOSX_DEPLOYMENT_TARGET=10.13 | export MACOSX_DEPLOYMENT_TARGET=10.13 | ||||||
| export Qt5_DIR=$(brew --prefix)/opt/qt5 | export Qt5_DIR=$(brew --prefix)/opt/qt5 | ||||||
| export PATH="/usr/local/opt/ccache/libexec:$PATH" | export PATH="/usr/local/opt/ccache/libexec:/usr/local/opt/llvm/bin:$PATH" | ||||||
|  | 
 | ||||||
|  | export CC="clang" | ||||||
|  | export CXX="clang++" | ||||||
|  | export LDFLAGS="-L/usr/local/opt/llvm/lib" | ||||||
|  | export CPPFLAGS="-I/usr/local/opt/llvm/include" | ||||||
| 
 | 
 | ||||||
| mkdir build && cd build | mkdir build && cd build | ||||||
| cmake .. -DCMAKE_BUILD_TYPE=Release -DENABLE_QT_TRANSLATION=ON -DCITRA_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DUSE_DISCORD_PRESENCE=ON -DENABLE_FFMPEG_AUDIO_DECODER=ON -DENABLE_FFMPEG_VIDEO_DUMPER=ON | cmake .. -DCMAKE_BUILD_TYPE=Release -DENABLE_QT_TRANSLATION=ON -DCITRA_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DUSE_DISCORD_PRESENCE=ON -DENABLE_FFMPEG_AUDIO_DECODER=ON -DENABLE_FFMPEG_VIDEO_DUMPER=ON | ||||||
|  |  | ||||||
|  | @ -2,5 +2,5 @@ | ||||||
| 
 | 
 | ||||||
| brew update | brew update | ||||||
| brew unlink python@2 | brew unlink python@2 | ||||||
| brew install qt5 sdl2 p7zip ccache ffmpeg | brew install qt5 sdl2 p7zip ccache ffmpeg llvm | ||||||
| pip3 install macpack | pip3 install macpack | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue