From c85f58ff69201c96b25de81c41a6f681c63f1e01 Mon Sep 17 00:00:00 2001
From: Maschell <Maschell@gmx.de>
Date: Sat, 26 May 2018 12:26:34 +0200
Subject: [PATCH] [Travis] Now using pacman for getting devkitppc, getting
 dynamic libs via git.

- Improved the Makefile to don't rely on the wii_rules
---
 .travis.yml | 31 +++++++++++++++++--------------
 Makefile    | 13 ++++++++++++-
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 976f4ff..343a97c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,33 +1,36 @@
-language: c
-sudo: false
+language: cpp
 
-os:
-  - linux
+os: linux
+sudo: false
+dist: trusty
 
 env:
   global:
     - DEVKITPRO=$HOME/devkitPro
-    - DEVKITPPC=${DEVKITPRO}/devkitPPC
 
 cache:
   directories:
-    - ${DEVKITPRO}
+    - "$HOME/.local"
+    - "/home/travis/portlibrepos"
 
 addons:
   apt:
     packages:
     - p7zip-full
 
-before_install: 
+before_install:
+  - mkdir -p "${PORTLIBREPOS}"
   - mkdir -p "${DEVKITPRO}"
-  - wget https://downloads.devkitpro.org/devkitPPC_r29-1-x86_64-linux.tar.bz2 -O devkitPPC-linux.tar.bz2
-  - wget https://github.com/Maschell/dynamic_libs/archive/lib.tar.gz -O dynamic_libs.tar.gz
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then wget https://github.com/devkitPro/pacman/releases/download/devkitpro-pacman-1.0.1/devkitpro-pacman.deb -O /tmp/devkitpro-pacman.deb; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo dpkg -i /tmp/devkitpro-pacman.deb; fi
+  - yes | sudo dkp-pacman -Syu devkitPPC
+  - export DEVKITPPC=/opt/devkitpro/devkitPPC
 
 install:
-  - tar -xjf devkitPPC-linux.tar.bz2 -C ${DEVKITPRO}/
-  - tar -xzvf dynamic_libs.tar.gz
-  - 7z x -y ./dynamic_libs-lib/libs/portlibs.zip -o${DEVKITPRO}
-  - (cd dynamic_libs-lib && make && make install)
+  - cd $PORTLIBREPOS
+  - ((git clone https://github.com/Maschell/dynamic_libs.git -b lib && (7z x -y ./dynamic_libs/libs/portlibs.zip -o${DEVKITPRO})) || (cd dynamic_libs && git pull))
+  - (cd dynamic_libs && ((make -j8 | grep -c "built ... ") && make install && echo "installed" ) || (echo "no need for make install" && make))
 
 script:
-  - make
+  - cd "$HOME"
+  - make && make install
\ No newline at end of file
diff --git a/Makefile b/Makefile
index e60d301..e9a3c42 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,18 @@ ifeq ($(strip $(DEVKITPPC)),)
 $(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC)
 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