[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

@@ -1,17 +1,17 @@
-language: c
+language: cpp
-sudo: false
 
-os:
+os: linux
-  - linux
+sudo: false
+dist: trusty
 
 env:
   global:
     - DEVKITPRO=$HOME/devkitPro
-    - DEVKITPPC=${DEVKITPRO}/devkitPPC
 
 cache:
   directories:
-    - ${DEVKITPRO}
+    - "$HOME/.local"
+    - "/home/travis/portlibrepos"
 
 addons:
   apt:
@@ -19,15 +19,18 @@ addons:
     - p7zip-full
 
 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
+  - 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
-  - wget https://github.com/Maschell/dynamic_libs/archive/lib.tar.gz -O dynamic_libs.tar.gz
+  - 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}/
+  - cd $PORTLIBREPOS
-  - tar -xzvf dynamic_libs.tar.gz
+  - ((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))
-  - 7z x -y ./dynamic_libs-lib/libs/portlibs.zip -o${DEVKITPRO}
+  - (cd dynamic_libs && ((make -j8 | grep -c "built ... ") && make install && echo "installed" ) || (echo "no need for make install" && make))
-  - (cd dynamic_libs-lib && make && make install)
 
 script:
-  - make
+  - cd "$HOME"
+  - make && make install

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