Attempts to fix arm7 build

Author: awkitsune

Diff for: arm7/Makefile

@@ -10,15 +10,15 @@ include $(DEVKITARM)/ds_rules
 
 #-----------------------------------------------------------------------
 # TARGET is the name of the output
-# BUILD is the directory for object files & intermediate files
+# BUILD is the directory where object files & intermediate files will be placed
 # SOURCES is a list of directories containing source code
 # INCLUDES is a list of directories containing extra header files
 #-----------------------------------------------------------------------
 TARGET		:= 	arm7
 BUILD		:=	build
 SOURCES		:=	source
-INCLUDES	:=	include build
-
+INCLUDES	:=	include
+DATA		:= 
 #-----------------------------------------------------------------------
 # options for code generation
 #-----------------------------------------------------------------------
@@ -40,7 +40,7 @@ LIBS	:=  -lnds7
 # list of directories containing libraries, this must be the top level
 # containing include and lib
 #-----------------------------------------------------------------------
-LIBDIRS	:=	 $(LIBNDS)
+LIBDIRS	:=	 $(LIBNDS) $(CURDIR)/..
 #-----------------------------------------------------------------------
 # no real need to edit anything past this point unless you need to add
 # additional rules for different file extensions
@@ -51,13 +51,13 @@ ifneq ($(BUILD),$(notdir $(CURDIR)))
 export ARM7ELF	:=	$(CURDIR)/$(TARGET).elf
 export DEPSDIR	:=	$(CURDIR)/$(BUILD)
 
-export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir))\
+export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
                 	$(foreach dir,$(DATA),$(CURDIR)/$(dir))
 
-CFILES   := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
-CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
-SFILES   := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
-BINFILES := $(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
+CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
+CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
+SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
+BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.)))
 
 #-----------------------------------------------------------------------
 # use CXX for linking C++ projects, CC for standard C
@@ -76,8 +76,8 @@ endif
 export OFILES	:=	$(addsuffix .o,$(BINFILES)) \
 					$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
 
-export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir))\
-                   	$(foreach dir,$(LIBDIRS),-I$(dir)/include)\
+export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
+					$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
                    -I$(CURDIR)/$(BUILD)
 
 export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib)

Diff for: arm9/Makefile

@@ -3,7 +3,7 @@
 #-----------------------------------------------------------------------
 
 ifeq ($(strip $(DEVKITARM)),)
-$(error "DEVKITARM not in environment.")
+$(error "Please set DEVKITARM in your environment.")
 endif
 
 include $(DEVKITARM)/ds_rules
@@ -50,7 +50,7 @@ LIBDIRS	:=	 $(LIBNDS) $(CURDIR)/..
 ifneq ($(BUILD),$(notdir $(CURDIR)))
 #-----------------------------------------------------------------------
 
-export ARM9ELF := $(CURDIR)/$(TARGET).elf
+export ARM9ELF 	:= 	$(CURDIR)/$(TARGET).elf
 export DEPSDIR	:=	$(CURDIR)/$(BUILD)
 
 export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
@@ -77,8 +77,8 @@ endif
 #-----------------------------------------------------------------------
 
 export OFILES	:=	$(addsuffix .o,$(BINFILES)) \
-			$(PNGFILES:.png=.o) \
-			$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
+					$(PNGFILES:.png=.o) \
+					$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
 
 export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
 					$(foreach dir,$(LIBDIRS),-I$(dir)/include) \