Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
4c13c6d
Switch to C2D (1)
joel16 Jul 7, 2018
1a98ed5
Switch to C2D (2)
joel16 Jul 8, 2018
bcc32b2
Populate files after using hidden toggle
joel16 Jul 8, 2018
e182eb3
Try to build properly
joel16 Jul 8, 2018
1d232b8
Try to build properly 2
joel16 Jul 8, 2018
73060a4
Try to build properly 3
joel16 Jul 8, 2018
8e6d235
Remove .elf and .smdh
joel16 Jul 8, 2018
cd1d1e3
Add networking stuff for updater
joel16 Jul 8, 2018
48dd54a
Fix updater
joel16 Jul 9, 2018
339067c
Test: display version
joel16 Jul 9, 2018
3b99726
Audio is implemented
joel16 Jul 13, 2018
3b6b258
Music player: Add shuffle/repeat/next and previous track
joel16 Jul 14, 2018
73d76c9
Add touch controls to settings and about menu
joel16 Jul 14, 2018
1da95f5
Add touch controls to file options
joel16 Jul 14, 2018
3e1be4e
Fix updater and misc changes
joel16 Jul 14, 2018
63713c3
Loading png/jpg now works for image viewer
joel16 Jul 15, 2018
2924a8b
Add bmp support + add CIA support
joel16 Jul 16, 2018
4632b0a
Attempt to fix travis builds again
joel16 Jul 17, 2018
5a0cdcc
Remove mbedtls
joel16 Jul 17, 2018
d8ffeac
Give makerom and bannertool root permissions
joel16 Jul 17, 2018
f50fb4b
Get rid of the . in front of build.sh
joel16 Jul 17, 2018
40be7e6
Export CC and CXX
joel16 Jul 17, 2018
97d051e
Upgrade first before installing
joel16 Jul 17, 2018
e999a2a
Properly upgrade before installing
joel16 Jul 17, 2018
4775954
Use ubuntu-toolchain-r-test
joel16 Jul 17, 2018
ddaca0c
Bring back mbedtls (needed for curl)
joel16 Jul 17, 2018
302c157
Use the -Syu command for curl
joel16 Jul 18, 2018
5aa01a2
Force upgrade mbedtls
joel16 Jul 18, 2018
929cc25
Only install curl
joel16 Jul 18, 2018
82f037d
Force install curl
joel16 Jul 18, 2018
bdaef55
Display file timestamp and fix text out of bounds in properties
joel16 Jul 18, 2018
04a8f8c
Fix sleep mode in music player, dark menu icons, more
joel16 Jul 18, 2018
f1421b8
Only build on master
joel16 Jul 18, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 26 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,39 @@ language: c

sudo: true

#Cache devkitARM and doxygen
cache:
directories:
- /home/travis/devkitPro

before_install:
- cd include/dr_libs/
- git clone https://github.com/mackron/dr_libs.git
- cd ../..
- export DEVKITPRO=/opt/devkitpro
- export DEVKITARM=/opt/devkitpro/devkitARM
- export CTRULIB=${DEVKITPRO}/libctru
- export PORTLIBS=${DEVKITPRO}/portlibs/armv6k
- sh resources/.travis-deps.sh
- wget https://github.com/devkitPro/pacman/releases/download/v1.0.0/devkitpro-pacman.deb
- sudo dpkg -i devkitpro-pacman.deb

addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- libstdc++-4.9-dev

install:
- sudo dkp-pacman -Syu 3ds-dev --noconfirm --needed
- sudo dkp-pacman -Syu 3ds-curl --noconfirm --force
- sudo dkp-pacman -S 3ds-libogg --noconfirm
- sudo dkp-pacman -S 3ds-libvorbisidec --noconfirm
- sudo dkp-pacman -S 3ds-mpg123 --noconfirm
- source /etc/profile.d/devkit-env.sh
- export CC=arm-none-eabi-gcc
- export CXX=arm-none-eabi-g++
- git clone --recursive https://github.com/Steveice10/bannertool && cd bannertool/
- make && sudo cp output/linux-x86_64/bannertool /opt/devkitpro/devkitARM/bin/bannertool
- cd ../ && rm -rf bannertool/
- git clone https://github.com/profi200/Project_CTR.git && cd Project_CTR/makerom
- make && sudo cp makerom /opt/devkitpro/devkitARM/bin/makerom
- cd ../.. && rm -rf Project_CTR

script:
- cd $TRAVIS_BUILD_DIR
- sh resources/.build.sh
- sh .travis/build.sh

deploy:
provider: pages
Expand Down
7 changes: 7 additions & 0 deletions .travis/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash -ex

source /etc/profile.d/devkit-env.sh
cd /3DShell
make clean && make
rm .gitignore .gitmodules .travis.yml 3DShell.elf 3DShell.smdh devkitpro-pacman.deb LICENSE Makefile README.md
rm -rf .travis build include res romfs source
Loading