Account for libctr9_io -> libctr9 rename

diff --git a/.gitmodules b/.gitmodules
index d7c029684c59db971bfcb24071a5a47b6325ff72..a33d75d45a0b397527595855242bcb9a2e84001f 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,6 +4,6 @@
 [submodule "host/bdfe"]
        path = host/bdfe
        url = https://github.com/chaoskagami/bdfe
-[submodule "external/libctr9_io"]
-       path = external/libctr9_io
-       url = https://github.com/gemarcano/libctr9_io
+[submodule "external/libctr9"]
+       path = external/libctr9
+       url = https://github.com/gemarcano/libctr9

diff --git a/Makefile b/Makefile
index fd9957ab3314101aaea9f6da4af8e9ed7d1dd885..5e76da99fff795bf1da05073ee70a2e582f059ba 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -46,9 +46,9 @@ REL ?= master
 CHAINLOADER ?= 1
 
 CROSS_ASFLAGS := -mlittle-endian -mcpu=arm946e-s -march=armv5te
-CROSS_CFLAGS  := -MMD -MP -Wall -Wextra -Werror -fomit-frame-pointer -I$(shell pwd)/external/libctr9_io/out/include -Os $(ASFLAGS) -fshort-wchar -fno-builtin -std=gnu11 -DVERSION=\"$(REVISION)\" -DREL=\"$(REL)\" -DCHAINLOADER=$(CHAINLOADER) -DPATH_CFW=\"/$(fw_folder)\" -DFW_NAME=\"$(fw_name)\" $(PATHARGS)
+CROSS_CFLAGS  := -MMD -MP -Wall -Wextra -Werror -fomit-frame-pointer -I$(shell pwd)/external/libctr9/out/include -Os $(ASFLAGS) -fshort-wchar -fno-builtin -std=gnu11 -DVERSION=\"$(REVISION)\" -DREL=\"$(REL)\" -DCHAINLOADER=$(CHAINLOADER) -DPATH_CFW=\"/$(fw_folder)\" -DFW_NAME=\"$(fw_name)\" $(PATHARGS)
 CROSS_FLAGS   := dir_out=$(abspath $(dir_out)) --no-print-directory
-CROSS_LDFLAGS := -nostdlib -Wl,-z,defs -lgcc -Wl,-Map,$(dir_build)/link.map -L$(shell pwd)/external/libctr9_io/out/lib -lctr9
+CROSS_LDFLAGS := -nostdlib -Wl,-z,defs -lgcc -Wl,-Map,$(dir_build)/link.map -L$(shell pwd)/external/libctr9/out/lib -lctr9
 
 objects_cfw = $(patsubst $(dir_source)/%.s, $(dir_build)/%.o, \
                          $(patsubst $(dir_source)/%.c, $(dir_build)/%.o, \
@@ -59,7 +59,7 @@ all: hosttools font ctr9io a9lh patch external
 
 .PHONY: ctr9io
 ctr9io:
-       cd external/libctr9_io && autoreconf -fi && CFLAGS= LDFLAGS= ASFLAGS= ./configure --host arm-none-eabi --prefix=$(shell pwd)/external/libctr9_io/out && make && make install
+       cd external/libctr9 && autoreconf -fi && CFLAGS= LDFLAGS= ASFLAGS= ./configure --host arm-none-eabi --prefix=$(shell pwd)/external/libctr9/out && make && make install
 
 .PHONY: release
 release:
@@ -116,7 +116,7 @@ $(dir_out)/$(fw_folder)/locale: all
 .PHONY: clean
 clean:
        rm -f host/{font-emit,font.h,font_prop.h,termfont.bin}
-       cd external/libctr9_io && git clean -fxd
+       cd external/libctr9 && git clean -fxd
        make -C external dir_out=$(dir_out) fw_folder=$(fw_folder) root=$(root) clean
        make -C patch dir_out=$(dir_out) fw_folder=$(fw_folder) root=$(root) clean
        make -C host/bdfe dir_out=$(dir_out) fw_folder=$(fw_folder) root=$(root) clean

diff --git a/README.md b/README.md
index 8f7655da4880870de344629c8a29491c8e41733d..b6fa96c8a8453a97202c0b8293f5ce1ca5393d7e 100644 (file)
--- a/README.md
+++ b/README.md
@@ -220,7 +220,7 @@ Credits
  * RE work, screen deinit.
 
 @gemarcano
- * For general help and libctr9_io (which is a submodule here.) Made life much easier.
+ * For general help and libctr9 (which is a submodule here.) Made life much easier.
 
 Temptress Cerise (GBATemp) 
  * A LOT of testing which was really helpful.

diff --git a/external/libctr9 b/external/libctr9
new file mode 160000 (submodule)
index 0000000..715c210
--- /dev/null
+++ b/external/libctr9
@@ -0,0 +1 @@
+Subproject commit 715c210cdf06632b87d8b1717e4be907ab6bc19e

diff --git a/external/libctr9_io b/external/libctr9_io
deleted file mode 160000 (submodule)
index 971dc41..0000000
--- a/external/libctr9_io
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 971dc41bcc715dd6f58fd469560411bcdf9be138