From 742742f275c05a6c290573d12c995e63aaa83c07 Mon Sep 17 00:00:00 2001
From: Dave Murphy <davem@devkitpro.org>
Date: Thu, 1 Jan 2015 22:08:39 +0000
Subject: [PATCH] set portlibs base path in base rules, add individual portlibs
 for each console

---
 dkarm-eabi/rules/3ds_rules  |  2 ++
 dkarm-eabi/rules/base_rules | 13 ++++++-------
 dkarm-eabi/rules/ds_rules   |  4 +++-
 dkarm-eabi/rules/gba_rules  |  2 ++
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/dkarm-eabi/rules/3ds_rules b/dkarm-eabi/rules/3ds_rules
index e7f4108..6d22b95 100644
--- a/dkarm-eabi/rules/3ds_rules
+++ b/dkarm-eabi/rules/3ds_rules
@@ -4,6 +4,8 @@ endif
 
 include $(DEVKITARM)/base_rules
 
+PORTLIBS	:=	$(PORTLIBS_PATH)/armv6k $(PORTLIBS_PATH)/3ds
+
 CTRULIB	:=	$(DEVKITPRO)/libctru
 
 ifeq ($(strip $(APP_TITLE)),)
diff --git a/dkarm-eabi/rules/base_rules b/dkarm-eabi/rules/base_rules
index 06a06ca..1cd4953 100644
--- a/dkarm-eabi/rules/base_rules
+++ b/dkarm-eabi/rules/base_rules
@@ -3,8 +3,7 @@ include $(DEVKITARM)/base_tools
 #---------------------------------------------------------------------------------
 # add portlibs path
 #---------------------------------------------------------------------------------
-export PORTLIBS	:=	$(DEVKITPRO)/portlibs/arm
-export PATH	:=	$(PORTLIBS)/bin:$(PATH)
+export PORTLIBS_PATH	:=	$(DEVKITPRO)/portlibs
 
 
 #---------------------------------------------------------------------------------
@@ -18,7 +17,7 @@ export PATH	:=	$(PORTLIBS)/bin:$(PATH)
 %.arm.o: %.arm.cpp
 	@echo $(notdir $<)
 	$(CXX) -MMD -MP -MF $(DEPSDIR)/$*.arm.d $(CXXFLAGS) -marm -c $< -o $@ $(ERROR_FILTER)
-	
+
 #---------------------------------------------------------------------------------
 %.arm.o: %.arm.c
 	@echo $(notdir $<)
@@ -33,7 +32,7 @@ export PATH	:=	$(PORTLIBS)/bin:$(PATH)
 %.thumb.o: %.thumb.cpp
 	@echo $(notdir $<)
 	$(CXX) -MMD -MP -MF $(DEPSDIR)/$*.thumb.d $(CXXFLAGS) -mthumb -c $< -o $@ $(ERROR_FILTER)
-	
+
 #---------------------------------------------------------------------------------
 %.thumb.o: %.thumb.c
 	@echo $(notdir $<)
@@ -48,7 +47,7 @@ export PATH	:=	$(PORTLIBS)/bin:$(PATH)
 %.iwram.o: %.iwram.cpp
 	@echo $(notdir $<)
 	$(CXX) -MMD -MP -MF $(DEPSDIR)/$*.iwram.d $(CXXFLAGS) -marm -mlong-calls -c $< -o $@ $(ERROR_FILTER)
-	
+
 #---------------------------------------------------------------------------------
 %.iwram.o: %.iwram.c
 	@echo $(notdir $<)
@@ -63,7 +62,7 @@ export PATH	:=	$(PORTLIBS)/bin:$(PATH)
 %.itcm.o: %.itcm.cpp
 	@echo $(notdir $<)
 	$(CXX) -MMD -MP -MF $(DEPSDIR)/$*.itcm.d $(CXXFLAGS) -marm -mlong-calls -c $< -o $@ $(ERROR_FILTER)
-	
+
 #---------------------------------------------------------------------------------
 %.itcm.o: %.itcm.c
 	@echo $(notdir $<)
@@ -79,7 +78,7 @@ export PATH	:=	$(PORTLIBS)/bin:$(PATH)
 %.o: %.cpp
 	@echo $(notdir $<)
 	$(CXX) -MMD -MP -MF $(DEPSDIR)/$*.d $(CXXFLAGS) -c $< -o $@ $(ERROR_FILTER)
-	
+
 #---------------------------------------------------------------------------------
 %.o: %.c
 	@echo $(notdir $<)
diff --git a/dkarm-eabi/rules/ds_rules b/dkarm-eabi/rules/ds_rules
index 30a2845..b380409 100644
--- a/dkarm-eabi/rules/ds_rules
+++ b/dkarm-eabi/rules/ds_rules
@@ -4,6 +4,8 @@ endif
 
 include $(DEVKITARM)/base_rules
 
+PORTLIBS	:=	$(PORTLIBS_PATH)/armv5te $(PORTLIBS_PATH)/nds
+
 LIBNDS	:=	$(DEVKITPRO)/libnds
 
 ifeq ($(strip $(GAME_TITLE)),)
@@ -40,7 +42,7 @@ endif
 %.arm9: %.elf
 	@$(OBJCOPY) -O binary $< $@
 	@echo built ... $(notdir $@)
- 
+
 #---------------------------------------------------------------------------------
 %.arm7: %.elf
 	@$(OBJCOPY) -O binary $< $@
diff --git a/dkarm-eabi/rules/gba_rules b/dkarm-eabi/rules/gba_rules
index 8b6ae3c..90e6f1a 100644
--- a/dkarm-eabi/rules/gba_rules
+++ b/dkarm-eabi/rules/gba_rules
@@ -4,6 +4,8 @@ endif
 
 include $(DEVKITARM)/base_rules
 
+PORTLIBS	:=	$(PORTLIBS_PATH)/armv4t $(PORTLIBS_PATH)/gba
+
 LIBGBA	:=	$(DEVKITPRO)/libgba
 
 #---------------------------------------------------------------------------------