Skip to content

Commit

Permalink
Merge pull request #250 from kot2002/master
Browse files Browse the repository at this point in the history
Use CakeBrah for compatibility
  • Loading branch information
AlbertoSONIC committed Sep 28, 2015
2 parents afdfedf + 21c8bb4 commit 83afbb6
Show file tree
Hide file tree
Showing 28 changed files with 16 additions and 2,088 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@
[submodule "CakesROP"]
path = CakesROP
url = https://github.com/mid-kid/CakesROP.git
[submodule "CakeBrah"]
path = CakeBrah
url = https://github.com/mid-kid/CakeBrah.git
1 change: 1 addition & 0 deletions CakeBrah
Submodule CakeBrah added at 83aaed
21 changes: 12 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,12 @@ SET_INCDIR := INCDIR=$(INCDIR)

CFLAGS = -std=c11 -O2 -Wall -Wextra
CAKEFLAGS = dir_out=$(CURDIR) name=$(CODE_FILE) filepath=$(SYSTEM_PATH)/
#CAKEFLAGS = dir_out=$(CURDIR) name=$(CODE_FILE)
CAKESROP = $(SET_DATNAME) DISPNAME=rxTools GRAPHICS=../logo
ROPFLAGS = $(SET_DATNAME) DISPNAME=rxTools GRAPHICS=../logo
BRAHFLAGS = name=$(CODE_FILE) filepath=$(SYSTEM_PATH)/ \
APP_TITLE="rxTools" \
APP_DESCRIPTION="Roxas75 3DS Toolkit & Custom Firmware" \
APP_AUTHOR="Patois, et al." \
ICON=$(abspath icon.png)

all: $(CODE_FILE)

Expand All @@ -38,9 +42,9 @@ clean: distclean
@$(MAKE) $(SET_SYSTEM_PATH) -C rxtools clean
@$(MAKE) -C rxmode clean
@$(MAKE) -C reboot clean
@$(MAKE) $(SET_CODE_PATH) -C brahma clean
@$(MAKE) $(BRAHFLAGS) -C CakeBrah clean
@$(MAKE) -C theme clean
@$(MAKE) $(CAKESROP) -C CakesROP clean
@$(MAKE) $(ROPFLAGS) -C CakesROP clean
@$(MAKE) $(SET_DATNAME) -C CakesROP/CakesROPSpider clean
@$(MAKE) $(CAKEFLAGS) -C CakeHax clean
@rm -Rf payload.bin $(CODE_FILE)
Expand Down Expand Up @@ -91,9 +95,8 @@ release-mset:

release-brahma:
@mkdir -p release/ninjhax/rxTools
@cp brahma/brahma.3dsx release/ninjhax/rxTools/rxtools.3dsx
@cp brahma/brahma.smdh release/ninjhax/rxTools/rxtools.smdh

@cp CakeBrah/code.bin.3dsx release/ninjhax/rxTools/rxtools.3dsx
@cp CakeBrah/code.bin.smdh release/ninjhax/rxTools/rxtools.smdh

all-target-patches: reboot/reboot.bin \
$(addprefix rxmode/build/,ktr/native_firm.elf \
Expand All @@ -104,11 +107,11 @@ $(CODE_FILE): rxtools/rxtools.bin
@dd if=rxtools/rxtools.bin of=$@ seek=160 conv=notrunc

all-target-mset:
@$(MAKE) $(CAKESROP) -C CakesROP
@$(MAKE) $(ROPFLAGS) -C CakesROP
@$(MAKE) $(SET_DATNAME) -C CakesROP/CakesROPSpider

all-target-brahma:
$(MAKE) $(SET_CODE_PATH) -C brahma
$(MAKE) $(BRAHFLAGS) -C CakeBrah

reboot/reboot.bin:
$(MAKE) -C $(dir $@)
Expand Down
181 changes: 0 additions & 181 deletions brahma/Makefile

This file was deleted.

121 changes: 0 additions & 121 deletions brahma/README

This file was deleted.

Loading

0 comments on commit 83afbb6

Please sign in to comment.