From 4278819a01aceaf0554e63f1936d4e8dfc13ce43 Mon Sep 17 00:00:00 2001 From: Ash Logan Date: Tue, 9 Apr 2019 20:59:32 +1000 Subject: [PATCH] samples: make WUT_ROOT makefile-local, always rely on DEVKITPRO --- .travis.yml | 4 ++-- samples/make/helloworld/Makefile | 4 ---- samples/make/helloworld_cpp/Makefile | 4 ---- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6e766c8b..61187e42 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/samples/make/helloworld/Makefile b/samples/make/helloworld/Makefile index 05868daa..b9e3777c 100644 --- a/samples/make/helloworld/Makefile +++ b/samples/make/helloworld/Makefile @@ -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 diff --git a/samples/make/helloworld_cpp/Makefile b/samples/make/helloworld_cpp/Makefile index 05868daa..b9e3777c 100644 --- a/samples/make/helloworld_cpp/Makefile +++ b/samples/make/helloworld_cpp/Makefile @@ -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