Merge branch 'build-cia' of git://github.com/WinterMute/ftbrony into …

…build-cia

.gitignore

@@ -1,8 +1,8 @@
 build/
 build.linux/
-buildtools/
 output/
 ftpd
 *.3dsx
+*.cia
 *.smdh
 *.elf

Makefile

@@ -1,10 +1,15 @@
-.PHONY: all clean linux
+.PHONY: all 3dsx cia clean linux
 
 export VERSION := 2.2
 
-all:
-	@$(MAKE) -f Makefile.3ds
+all: 3dsx
 
+3dsx:
+	@$(MAKE) -f Makefile.3ds 3dsx
+
+cia:
+	@$(MAKE) -f Makefile.3ds cia
+
 linux:
 	@$(MAKE) -f Makefile.linux
 

Makefile.3ds

@@ -37,7 +37,11 @@ ROMFS    :=
 APP_TITLE       := Super ftpd II Turbo
 APP_DESCRIPTION := v$(VERSION)
 APP_AUTHOR      := mtheall
-ICON            := ftpd.png
+
+ICON		:=	meta/icon.png
+BNR_IMAGE	:=  meta/banner.png
+BNR_AUDIO	:=	meta/audio.wav
+RSF_FILE	:=	meta/ftpd-cia.rsf
 
 #---------------------------------------------------------------------------------
 # options for code generation
@@ -131,15 +135,21 @@ endif
 
 #---------------------------------------------------------------------------------
 all: $(BUILD)
+	@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile.3ds
+
+3dsx: $(BUILD)
+	@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile.3ds 3dsx
+
+cia: $(BUILD)
+	@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile.3ds cia
 
 $(BUILD):
 	@[ -d $@ ] || mkdir -p $@
-	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile.3ds
 
 #---------------------------------------------------------------------------------
 clean:
 	@echo clean ...
-	@rm -fr $(BUILD) $(TARGET).3dsx $(OUTPUT).smdh $(TARGET).elf
+	@rm -fr $(BUILD) $(TARGET).3dsx $(OUTPUT).smdh $(TARGET).elf $(TARGET).cia output/
 
 
 #---------------------------------------------------------------------------------
@@ -150,15 +160,37 @@ DEPENDS := $(OFILES:.o=.d)
 #---------------------------------------------------------------------------------
 # main targets
 #---------------------------------------------------------------------------------
+#all: $(OUTPUT).cia $(OUTPUT).3dsx
+
+3dsx: $(OUTPUT).3dsx
+
+cia: $(OUTPUT).cia
+
 ifeq ($(strip $(NO_SMDH)),)
 .PHONY: all
 all	:	$(OUTPUT).3dsx $(OUTPUT).smdh
-$(OUTPUT).smdh : $(TOPDIR)/Makefile
+$(OUTPUT).smdh : $(TOPDIR)/Makefile.3ds
 $(OUTPUT).3dsx: $(OUTPUT).smdh
 endif
+
 $(OUTPUT).3dsx: $(OUTPUT).elf
 $(OUTPUT).elf:  $(OFILES)
 
+#$(OUTPUT).smdh	:	$(APP_ICON)
+#	@bannertool makesmdh -s "$(APP_TITLE)" -l "$(APP_DESCRIPTION)"  -p "$(APP_AUTHOR)" -i $(APP_ICON) -o $@
+#	@echo "built ... $(notdir $@)"
+
+$(OUTPUT).cia	:	$(OUTPUT).elf $(OUTPUT).smdh $(TARGET).bnr $(TOPDIR)/$(RSF_FILE)
+	@makerom	-f cia -target t -exefslogo -o $@ \
+				-elf $(OUTPUT).elf -rsf $(TOPDIR)/$(RSF_FILE) \
+				-banner $(TARGET).bnr \
+				-icon $(OUTPUT).smdh
+	@echo "built ... $(notdir $@)"
+
+$(TARGET).bnr	:	$(TOPDIR)/$(BNR_IMAGE) $(TOPDIR)/$(BNR_AUDIO)
+	@bannertool	makebanner -o $@ -i $(TOPDIR)/$(BNR_IMAGE) -a $(TOPDIR)/$(BNR_AUDIO)
+	@echo "built ... $@"
+
 #---------------------------------------------------------------------------------
 # you need a rule like this for each extension you use as binary data
 #---------------------------------------------------------------------------------

Makefile.linux

@@ -1,4 +1,4 @@
-TARGET  := $(notdir $(CURDIR))
+TARGET  := ftpd
 
 CFILES  := $(wildcard source/*.c)
 OFILES  := $(patsubst source/%,build.linux/%,$(CFILES:.c=.o))