Merge branch 'master' into piaf_integration

Makefile

@@ -44,6 +44,8 @@ $(strip \
 endef
 
 include config.mk
+-include platform/$(PLATFORM)/rules.mk
+-include external/platform/$(PLATFORM)/rules.mk
 include rules.mk
 
 config.mk:

external/platform/nspire/rules.mk

@@ -1,8 +1,8 @@
-external_LOCAL_PATH := $(call whereami)
+external_nspire_LOCAL_PATH := $(call whereami)
 
 CPPFLAGS += -DLODEPNG_NO_COMPILE_CPP
 
-INCLUDE_EXT += $(external_LOCAL_PATH)/lodepng
+INCLUDE_EXT += $(external_nspire_LOCAL_PATH)/lodepng
 
-SRCS_CPP += $(external_LOCAL_PATH)/lodepng/lodepng.cpp
+SRCS_CPP += $(external_nspire_LOCAL_PATH)/lodepng/lodepng.cpp
 

mkconfig

@@ -5,8 +5,7 @@ TARGET_LIST=("nspire" "sfml")
 create_configuration() {
 	echo "Creating $1 configuration"
 	rm config.mk -f
-	echo "include platform/$1/rules.mk" >> config.mk
-	echo "include external/platform/$1/rules.mk" >> config.mk
+	echo "PLATFORM := $1" >> config.mk
 }
 
 is_valid_target() {

platform/nspire/rules.mk

@@ -12,7 +12,6 @@ CPP = nspire-g++
 ZEHN = genzehn
 ZEHNFLAGS = --name "$(NAME)" --compress
 
-PLATFORM = nspire
 EXE = $(OUT)/$(NAME).tns
 
 $(EXE): $(ELF)

platform/sfml/rules.mk

@@ -11,7 +11,6 @@ CFLAGS_COMMON += -DSFML=1
 CC = gcc
 CPP = g++
 
-PLATFORM = sfml
 EXE = $(OUT)/$(NAME)
 
 $(EXE): $(ELF)