alex/gba
1
0
Fork 0
mirror of https://github.com/italicsjenga/gba.git synced 2024-12-24 11:11:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

travisCI fix

Browse source
This commit is contained in:
Lokathor 2018-12-25 23:52:30 -07:00
parent d6a6301815
commit 01ac3ec09e
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.travis.yml
View file

@ -2,7 +2,9 @@ language: rust
sudo: false sudo: false
cache: cache:
- cargo # Cache ONLY .cargo, not target/ like usual
directories:
- $HOME/.cargo
rust: rust:
- nightly - nightly
@ -17,8 +19,6 @@ before_script:
- cargo install-update -a - cargo install-update -a
script: script:
# Travis seems to cache for some dumb reason, but we don't want that at all.
- rm -fr target
# Obtain the devkitPro tools, using `target/` as a temp directory # Obtain the devkitPro tools, using `target/` as a temp directory
- mkdir -p target - mkdir -p target
- cd target - cd target

8
src/video/tiled.rs
View file

@ -59,25 +59,25 @@ newtype! {
newtype! { newtype! {
/// A screenblock for use in Affine mode. /// A screenblock for use in Affine mode.
#[derive(Clone, Copy)] #[derive(Clone, Copy)]
AffineScreenblock_16x16, [AffineScreenblockEntry; 16*16], no frills AffineScreenblock16x16, [AffineScreenblockEntry; 16*16], no frills
} }
newtype! { newtype! {
/// A screenblock for use in Affine mode. /// A screenblock for use in Affine mode.
#[derive(Clone, Copy)] #[derive(Clone, Copy)]
AffineScreenblock_32x32, [AffineScreenblockEntry; 32*32], no frills AffineScreenblock32x32, [AffineScreenblockEntry; 32*32], no frills
} }
newtype! { newtype! {
/// A screenblock for use in Affine mode. /// A screenblock for use in Affine mode.
#[derive(Clone, Copy)] #[derive(Clone, Copy)]
AffineScreenblock_64x64, [AffineScreenblockEntry; 64*64], no frills AffineScreenblock64x64, [AffineScreenblockEntry; 64*64], no frills
} }
newtype! { newtype! {
/// A screenblock for use in Affine mode. /// A screenblock for use in Affine mode.
#[derive(Clone, Copy)] #[derive(Clone, Copy)]
AffineScreenblock_128x128, [AffineScreenblockEntry; 128*128], no frills AffineScreenblock128x128, [AffineScreenblockEntry; 128*128], no frills
} }
pub const VRAM_CHARBLOCKS: VolAddressBlock<Charblock4bpp> = unsafe { VolAddressBlock::new_unchecked(VolAddress::new_unchecked(VRAM_BASE_USIZE), 6) }; pub const VRAM_CHARBLOCKS: VolAddressBlock<Charblock4bpp> = unsafe { VolAddressBlock::new_unchecked(VolAddress::new_unchecked(VRAM_BASE_USIZE), 6) };