mirror of
				https://git.tardis.systems/mirrors/yuzu
				synced 2025-11-04 04:34:07 +01:00 
			
		
		
		
	Merge pull request #2208 from freiro/libsdl205
Windows, move to SDL2-2.0.5
This commit is contained in:
		
						commit
						34d491295c
					
				@ -19,8 +19,8 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
 | 
			
		||||
 | 
			
		||||
    if [ ! -e $HOME/.local/lib/libSDL2.la ]; then
 | 
			
		||||
        echo "SDL2 not found in cache, get and build it..."
 | 
			
		||||
        wget http://libsdl.org/release/SDL2-2.0.4.tar.gz -O - | tar xz
 | 
			
		||||
        cd SDL2-2.0.4
 | 
			
		||||
        wget http://libsdl.org/release/SDL2-2.0.5.tar.gz -O - | tar xz
 | 
			
		||||
        cd SDL2-2.0.5
 | 
			
		||||
        ./configure --prefix=$HOME/.local
 | 
			
		||||
        make -j4 && make install
 | 
			
		||||
    else
 | 
			
		||||
 | 
			
		||||
@ -156,7 +156,7 @@ if (ENABLE_SDL2)
 | 
			
		||||
    if (CITRA_USE_BUNDLED_SDL2)
 | 
			
		||||
        # Detect toolchain and platform
 | 
			
		||||
        if (MSVC14 AND ARCHITECTURE_x86_64)
 | 
			
		||||
            set(SDL2_VER "SDL2-2.0.4")
 | 
			
		||||
            set(SDL2_VER "SDL2-2.0.5")
 | 
			
		||||
        else()
 | 
			
		||||
            message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable CITRA_USE_BUNDLED_SDL2 and provide your own.")
 | 
			
		||||
        endif()
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user