samples: make WUT_ROOT makefile-local, always rely on DEVKITPRO

This commit is contained in:
Ash Logan 2019-04-09 20:59:32 +10:00
parent 09c16421d8
commit 4278819a01
3 changed files with 2 additions and 10 deletions

View File

@ -31,8 +31,8 @@ install:
script:
- cd "$TRAVIS_BUILD_DIR"
# Build wut
- make -j4 install DESTDIR=wut_install
- export WUT_ROOT=$PWD/wut_install/opt/devkitpro/wut
- make -j4
- sudo make install
# Build tests
- echo Tests disabled for now
# - cd tests

View File

@ -8,11 +8,7 @@ endif
TOPDIR ?= $(CURDIR)
ifeq ($(strip $(WUT_ROOT)),)
include $(DEVKITPRO)/wut/share/wut_rules
else
include $(WUT_ROOT)/share/wut_rules
endif
#-------------------------------------------------------------------------------
# TARGET is the name of the output

View File

@ -8,11 +8,7 @@ endif
TOPDIR ?= $(CURDIR)
ifeq ($(strip $(WUT_ROOT)),)
include $(DEVKITPRO)/wut/share/wut_rules
else
include $(WUT_ROOT)/share/wut_rules
endif
#-------------------------------------------------------------------------------
# TARGET is the name of the output