From f8bf4628b474a2c9dceafd1b2d25c3848ccc756a Mon Sep 17 00:00:00 2001 From: Maschell Date: Sat, 26 May 2018 12:17:42 +0200 Subject: [PATCH] [Travis] Fixed caching Stopped using the wii_rules. --- .travis.yml | 10 +++++----- Makefile | 13 +++++++++++-- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5ee9b51..8da153c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ -language: c -sudo: false +language: cpp -os: - - linux +os: linux +sudo: false +dist: trusty env: global: @@ -10,7 +10,7 @@ env: cache: directories: - - ${DEVKITPRO} + - "$HOME/.local" addons: apt: diff --git a/Makefile b/Makefile index 8c92b4e..c63452a 100644 --- a/Makefile +++ b/Makefile @@ -8,10 +8,19 @@ ifeq ($(strip $(DEVKITPRO)),) $(error "Please set DEVKITPRO in your environment. export DEVKITPRO=devkitPRO") endif -include $(DEVKITPPC)/wii_rules - +export PATH := $(DEVKITPPC)/bin:$(PORTLIBS)/bin:$(PATH) export PORTLIBS := $(DEVKITPRO)/portlibs/ppc +PREFIX := powerpc-eabi- + +export AS := $(PREFIX)as +export CC := $(PREFIX)gcc +export CXX := $(PREFIX)g++ +export AR := $(PREFIX)ar +export OBJCOPY := $(PREFIX)objcopy + +include $(DEVKITPPC)/base_rules + #--------------------------------------------------------------------------------- # BUILD is the directory where object files & intermediate files will be placed # SOURCES is a list of directories containing source code