Get arm11u example building again

diff --git a/examples/arm11u/Makefile b/examples/arm11u/Makefile
index 49a678cd29a71d877d1d423a008d5156cf30c9cd..9a743607b88f3932ad382f9bafe0b662bea90906 100644 (file)
--- a/examples/arm11u/Makefile
+++ b/examples/arm11u/Makefile
@@ -1,41 +1,139 @@
-CC = arm-none-eabi-gcc
-LINK = arm-none-eabi-ld
-OBJCOPY = arm-none-eabi-objcopy
-CTRULIB = ../../libctru
-CFLAGS += -Wall -std=c99 -march=armv6 -O3 -I"$(CTRULIB)/include"
-LDFLAGS += --script=ccd00.ld -L"$(DEVKITARM)/arm-none-eabi/lib" -L"$(CTRULIB)/lib"
+#---------------------------------------------------------------------------------
+.SUFFIXES:
+#---------------------------------------------------------------------------------
 
-CFILES = $(wildcard source/*.c)
-OFILES = $(CFILES:source/%.c=build/%.o)
-DFILES = $(CFILES:source/%.c=build/%.d)
-SFILES = $(wildcard source/*.s)
-OFILES += $(SFILES:source/%.s=build/%.o)
-PROJECTNAME = ${shell basename "$(CURDIR)"}
+ifeq ($(strip $(DEVKITARM)),)
+$(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM")
+endif
 
-.PHONY:=all dir
+ifeq ($(strip $(CTRULIB)),)
+# THIS IS TEMPORARY - in the future it should be at $(DEVKITPRO)/libctru
+$(error "Please set CTRULIB in your environment. export CTRULIB=<path to>libctru")
+endif
 
-all: dir $(PROJECTNAME).bin
+TOPDIR ?= $(CURDIR)
+include $(DEVKITARM)/3ds_rules
 
-dir:
-       @mkdir -p build
+#---------------------------------------------------------------------------------
+# TARGET is the name of the output
+# BUILD is the directory where object files & intermediate files will be placed
+# SOURCES is a list of directories containing source code
+# DATA is a list of directories containing data files
+# INCLUDES is a list of directories containing header files
+# SPECS is the directory containing the important build and link files
+#---------------------------------------------------------------------------------
+export TARGET          :=      $(shell basename $(CURDIR))
+BUILD          :=      build
+SOURCES                :=      source
+DATA           :=      data
+INCLUDES       :=      include
 
-$(PROJECTNAME).bin: $(PROJECTNAME).elf
-       $(OBJCOPY) -O binary $< $@
 
-$(PROJECTNAME).elf: $(OFILES)
-       $(LINK) $(LDFLAGS) -o $(PROJECTNAME).elf $(filter-out build/crt0.o, $(OFILES)) -lctru -lc
+#---------------------------------------------------------------------------------
+# options for code generation
+#---------------------------------------------------------------------------------
+ARCH   :=      -march=armv6k -mtune=mpcore
 
-clean:
-       @rm -f build/*.o build/*.d
-       @rm -f $(PROJECTNAME).elf $(PROJECTNAME).bin
-       @echo "all cleaned up !"
+CFLAGS :=      -g -Wall -O2 -mword-relocations -save-temps \
+                       -fomit-frame-pointer -ffast-math \
+                       $(ARCH)
+
+CFLAGS +=      $(INCLUDE) -DARM11 -D_3DS
+
+CXXFLAGS       := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
+
+ASFLAGS        :=      -g $(ARCH)
+LDFLAGS        =       -specs=3dsx.specs -g $(ARCH) \
+                       -Wl,-Map,$(TARGET).map
+
+LIBS   := -lctru -lm
+
+#---------------------------------------------------------------------------------
+# list of directories containing libraries, this must be the top level containing
+# include and lib
+#---------------------------------------------------------------------------------
+LIBDIRS        := $(CTRULIB)
+ 
+  
+#---------------------------------------------------------------------------------
+# no real need to edit anything past this point unless you need to add additional
+# rules for different file extensions
+#---------------------------------------------------------------------------------
+ifneq ($(BUILD),$(notdir $(CURDIR)))
+#---------------------------------------------------------------------------------
+ 
+export OUTPUT  :=      $(CURDIR)/$(TARGET)
+export TOPDIR  :=      $(CURDIR)
+
+export VPATH   :=      $(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
+                       $(foreach dir,$(DATA),$(CURDIR)/$(dir))
+
+export DEPSDIR :=      $(CURDIR)/$(BUILD)
 
--include $(DFILES)
+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
+#---------------------------------------------------------------------------------
+ifeq ($(strip $(CPPFILES)),)
+#---------------------------------------------------------------------------------
+       export LD       :=      $(CC)
+#---------------------------------------------------------------------------------
+else
+#---------------------------------------------------------------------------------
+       export LD       :=      $(CXX)
+#---------------------------------------------------------------------------------
+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) \
+                       -I$(CURDIR)/$(BUILD)
+
+export LIBPATHS        :=      $(foreach dir,$(LIBDIRS),-L$(dir)/lib)
+
+.PHONY: $(BUILD) clean all
+ 
+#---------------------------------------------------------------------------------
+all: $(BUILD)
+
+$(BUILD):
+       @[ -d $@ ] || mkdir -p $@
+       @make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
+ 
+#---------------------------------------------------------------------------------
+clean:
+       @echo clean ...
+       @rm -fr $(BUILD) $(TARGET).3dsx $(TARGET).elf
+ 
+ 
+#---------------------------------------------------------------------------------
+else
+ 
+DEPENDS        :=      $(OFILES:.o=.d)
+ 
+#---------------------------------------------------------------------------------
+# main targets
+#---------------------------------------------------------------------------------
+$(OUTPUT).3dsx :       $(OUTPUT).elf
+$(OUTPUT).elf  :       $(OFILES)
 
-build/%.o: source/%.c
-       $(CC) $(CFLAGS) -c $< -o $@
-       @$(CC) -MM $< > build/$*.d
+#---------------------------------------------------------------------------------
+# you need a rule like this for each extension you use as binary data 
+#---------------------------------------------------------------------------------
+%.bin.o        :       %.bin
+#---------------------------------------------------------------------------------
+       @echo $(notdir $<)
+       $(bin2o)
 
-build/%.o: source/%.s
-       $(CC) $(CFLAGS) -c $< -o $@
-       @$(CC) -MM $< > build/$*.d
+-include $(DEPENDS)
+ 
+#---------------------------------------------------------------------------------------
+endif
+#---------------------------------------------------------------------------------------

diff --git a/examples/arm11u/source/crt0.s b/examples/arm11u/source/crt0.s
deleted file mode 100644 (file)
index 557c327..0000000
--- a/examples/arm11u/source/crt0.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.section ".init"
-.arm
-.align 4
-.global _init
-.global _start
-
-_start:
-       blx __libc_init_array
-       blx main
-
-_init:
-       bx lr

diff --git a/examples/arm11u/source/main.c b/examples/arm11u/source/main.c
index c770d061b82096fabfb65e22a359ab6694fcbc53..0c0f677d001688d94d907b96d1422749037f2ef8 100644 (file)
--- a/examples/arm11u/source/main.c
+++ b/examples/arm11u/source/main.c
@@ -1,10 +1,11 @@
 #include <3ds/types.h>
 #include <3ds/srv.h>
-#include <3ds/APT.h>
-#include <3ds/GSP.h>
-#include <3ds/GX.h>
-#include <3ds/HID.h>
 #include <3ds/svc.h>
+#include <3ds/gpu/gx.h>
+#include <3ds/services/apt.h>
+#include <3ds/services/gsp.h>
+#include <3ds/services/hid.h>
+
 #include "costable.h"
 
 u8* gspHeap;
@@ -43,7 +44,7 @@ void gspGpuInit()
        svcControlMemory((u32*)&gspHeap, 0x0, 0x0, 0x2000000, 0x10003, 0x3);
 
        //wait until we can write stuff to it
-       svcWaitSynchronization1(gspEvent, 0x55bcb0);
+       svcWaitSynchronization(gspEvent, 0x55bcb0);
 
        //GSP shared mem : 0x2779F000
        gxCmdBuf=(u32*)(0x10002000+0x800+threadID*0x200);