* makefile stuff

This commit is contained in:
giantpune 2010-09-21 17:38:18 +00:00
parent 4e78cbb37d
commit 4eab0cb29f
6 changed files with 40 additions and 24 deletions

View File

@ -2,8 +2,8 @@
<app version="1"> <app version="1">
<name> USB Loader GX</name> <name> USB Loader GX</name>
<coder>USB Loader GX Team</coder> <coder>USB Loader GX Team</coder>
<version>1.0 r958</version> <version>1.0 r960</version>
<release_date>201009191649</release_date> <release_date>201009211724</release_date>
<short_description>Loads games from USB-devices</short_description> <short_description>Loads games from USB-devices</short_description>
<long_description>USB Loader GX is a libwiigui based USB iso loader with a wii-like GUI. You can install games to your HDDs and boot them with shorter loading times. <long_description>USB Loader GX is a libwiigui based USB iso loader with a wii-like GUI. You can install games to your HDDs and boot them with shorter loading times.
The interactive GUI is completely controllable with WiiMote, Classic Controller or GC Controller. The interactive GUI is completely controllable with WiiMote, Classic Controller or GC Controller.

View File

@ -129,26 +129,26 @@ export OUTPUT := $(CURDIR)/$(TARGET)
$(BUILD): $(BUILD):
@[ -d $@ ] || mkdir -p $@ @[ -d $@ ] || mkdir -p $@
@/bin/bash ./buildtype.sh @/bin/bash ./buildtype.sh
@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile @$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
# @echo debug... # @echo debug...
# start geckoreader.exe # start geckoreader.exe
channel: channel:
@[ -d build ] || mkdir -p build @[ -d build ] || mkdir -p build
@/bin/bash ./buildtype.sh FULLCHANNEL @/bin/bash ./buildtype.sh FULLCHANNEL
@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile @$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
lang: lang:
@[ -d build ] || mkdir -p build @[ -d build ] || mkdir -p build
@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile language @$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile language
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
all: all:
@[ -d build ] || mkdir -p build @[ -d build ] || mkdir -p build
@./buildtype.sh @./buildtype.sh
@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile @$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile language @$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile language
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
clean: clean:
@ -156,7 +156,7 @@ clean:
@rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol @rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
run: run:
make $(MAKE)
@echo Done building ... @echo Done building ...
@echo Now Run That Shit ... @echo Now Run That Shit ...
@ -168,7 +168,7 @@ reload:
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
release: release:
make $(MAKE)
cp boot.dol ./hbc/boot.dol cp boot.dol ./hbc/boot.dol
@ -190,7 +190,7 @@ language: $(wildcard $(PROJECTDIR)/Languages/*.lang)
%.elf.o : %.elf %.elf.o : %.elf
@echo $(notdir $<) @echo $(notdir $<)
$(bin2o) @bin2s -a 32 $< | $(AS) -o $(@)
%.dol.o : %.dol %.dol.o : %.dol
@echo $(notdir $<) @echo $(notdir $<)
@ -198,39 +198,44 @@ language: $(wildcard $(PROJECTDIR)/Languages/*.lang)
%.ttf.o : %.ttf %.ttf.o : %.ttf
@echo $(notdir $<) @echo $(notdir $<)
$(bin2o) @bin2s -a 32 $< | $(AS) -o $(@)
%.png.o : %.png %.png.o : %.png
@echo $(notdir $<) @echo $(notdir $<)
$(bin2o) @bin2s -a 32 $< | $(AS) -o $(@)
%.ogg.o : %.ogg %.ogg.o : %.ogg
@echo $(notdir $<) @echo $(notdir $<)
$(bin2o) @bin2s -a 32 $< | $(AS) -o $(@)
%.pcm.o : %.pcm %.pcm.o : %.pcm
@echo $(notdir $<) @echo $(notdir $<)
$(bin2o) @bin2s -a 32 $< | $(AS) -o $(@)
%.mp3.o : %.mp3 %.mp3.o : %.mp3
@echo $(notdir $<) @echo $(notdir $<)
$(bin2o) @bin2s -a 32 $< | $(AS) -o $(@)
%.certs.o : %.certs %.certs.o : %.certs
@echo $(notdir $<) @echo $(notdir $<)
$(bin2o) @bin2s -a 32 $< | $(AS) -o $(@)
%.dat.o : %.dat %.dat.o : %.dat
@echo $(notdir $<) @echo $(notdir $<)
$(bin2o) @bin2s -a 32 $< | $(AS) -o $(@)
%.bin.o : %.bin %.bin.o : %.bin
@echo $(notdir $<) @echo $(notdir $<)
$(bin2o) @bin2s -a 32 $< | $(AS) -o $(@)
%.tik.o : %.tik %.tik.o : %.tik
@echo $(notdir $<) @echo $(notdir $<)
$(bin2o) @bin2s -a 32 $< | $(AS) -o $(@)
%.tmd.o : %.tmd %.tmd.o : %.tmd
@echo $(notdir $<) @echo $(notdir $<)
$(bin2o) @bin2s -a 32 $< | $(AS) -o $(@)
export PATH := $(PROJECTDIR)/gettext-bin:$(PATH) export PATH := $(PROJECTDIR)/gettext-bin:$(PATH)

View File

@ -546,4 +546,16 @@ extern const u32 lock_png_size;
extern const u8 unlock_png[]; extern const u8 unlock_png[];
extern const u32 unlock_png_size; extern const u32 unlock_png_size;
extern const u8 stub_bin[];
extern const u32 stub_bin_size;
extern const u8 fatffs_module_bin[];
extern const u32 fatffs_module_bin_size;
extern const u8 ehcmodule_frag_v4_bin[];
extern const u32 ehcmodule_frag_v4_bin_size;
extern const u8 ehcmodule_frag_v5_bin[];
extern const u32 ehcmodule_frag_v5_bin_size;
#endif #endif

View File

@ -7,7 +7,7 @@
#include "lstub.h" #include "lstub.h"
#include "stub_bin.h" #include "filelist.h"
#include "gecko.h" #include "gecko.h"
#include "wad/nandtitle.h" #include "wad/nandtitle.h"

View File

@ -1,6 +1,5 @@
#include "mload_modules.h" #include "mload_modules.h"
#include "ehcmodule_frag_v4_bin.h" #include "filelist.h"
#include "ehcmodule_frag_v5_bin.h"
#include "gecko.h" #include "gecko.h"
#define ALIGNED(x) __attribute__((aligned(x))) #define ALIGNED(x) __attribute__((aligned(x)))

View File

@ -3,7 +3,7 @@
#include "dip_plugin.h" #include "dip_plugin.h"
#include "mload.h" #include "mload.h"
#include "fatffs_module_bin.h" #include "filelist.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"