From c7668c0cb0e4784ac8a2f03ec0cfc240d25fbc69 Mon Sep 17 00:00:00 2001 From: jakcron Date: Sun, 17 Feb 2019 15:21:19 +0800 Subject: [PATCH 1/6] Update makefiles --- deps/libfnd | 2 +- deps/liblz4 | 2 +- deps/libnintendo-es | 2 +- deps/libnintendo-hac | 2 +- deps/libnintendo-hac-hb | 2 +- deps/libnintendo-pki | 2 +- deps/libpolarssl | 2 +- makefile | 216 +++++++++++++++++++++++----------------- 8 files changed, 134 insertions(+), 96 deletions(-) diff --git a/deps/libfnd b/deps/libfnd index 8cdd41b..8f0fc94 160000 --- a/deps/libfnd +++ b/deps/libfnd @@ -1 +1 @@ -Subproject commit 8cdd41b13ed369638583f733b3f60494525976ff +Subproject commit 8f0fc940fc01198fd24ff3301841ede089c9ada4 diff --git a/deps/liblz4 b/deps/liblz4 index c50865c..fedcdbf 160000 --- a/deps/liblz4 +++ b/deps/liblz4 @@ -1 +1 @@ -Subproject commit c50865c96a87a86b8429e3b08a7c6e39e56e2815 +Subproject commit fedcdbf5b4ac47aa09f7d9b0e665c2ae38c6edff diff --git a/deps/libnintendo-es b/deps/libnintendo-es index c294d8b..034d24c 160000 --- a/deps/libnintendo-es +++ b/deps/libnintendo-es @@ -1 +1 @@ -Subproject commit c294d8b81eda7f5cf75bb58f725d4b3c9189bc92 +Subproject commit 034d24c54f6d0b090865d187e8e454a126791816 diff --git a/deps/libnintendo-hac b/deps/libnintendo-hac index 67a4242..324f45d 160000 --- a/deps/libnintendo-hac +++ b/deps/libnintendo-hac @@ -1 +1 @@ -Subproject commit 67a4242a76aaf1d4c7d40c7c3b1b1f7a640a77ba +Subproject commit 324f45d08b4d39157729e84429e95c9891224f3f diff --git a/deps/libnintendo-hac-hb b/deps/libnintendo-hac-hb index ff5570e..f0c9854 160000 --- a/deps/libnintendo-hac-hb +++ b/deps/libnintendo-hac-hb @@ -1 +1 @@ -Subproject commit ff5570e7642d4eadadf2b09c49e5b926cae9f4c0 +Subproject commit f0c9854c00880c26a52645ab4cb027653c67a3be diff --git a/deps/libnintendo-pki b/deps/libnintendo-pki index add0fdd..589465a 160000 --- a/deps/libnintendo-pki +++ b/deps/libnintendo-pki @@ -1 +1 @@ -Subproject commit add0fddabea63a32248ae16b75d8dfb8bfda16a5 +Subproject commit 589465a7e8b410739004b5e4c9fa814cb0365286 diff --git a/deps/libpolarssl b/deps/libpolarssl index 374b573..1ab999e 160000 --- a/deps/libpolarssl +++ b/deps/libpolarssl @@ -1 +1 @@ -Subproject commit 374b573ea76e42bd07dd7cf983778eb7be8bb522 +Subproject commit 1ab999e3f9f7d95aeed963dddf7d0f4b34e68110 diff --git a/makefile b/makefile index bd9fc60..c230d81 100644 --- a/makefile +++ b/makefile @@ -1,90 +1,106 @@ +# C++/C Recursive Project Makefile +# (c) Jack +# Version 2 + # Project Defines PROJECT_NAME = nstool +PROJECT_VER_MAJOR = 1 +PROJECT_VER_MINOR = 1 +PROJECT_VER_PATCH = 0 + +# Project Relative Paths PROJECT_PATH = $(CURDIR) -PROJECT_SRC_PATH = ./src -PROJECT_INCLUDE_PATH = -PROJECT_TEST_PATH = -PROJECT_BIN_PATH = ./bin -PROJECT_DOCS_PATH = -PROJECT_DOXYFILE_PATH = +PROJECT_SRC_PATH = src +PROJECT_SRC_SUBDIRS = $(PROJECT_SRC_PATH) +#PROJECT_INCLUDE_PATH = include +#PROJECT_TESTSRC_PATH = test +#PROJECT_TESTSRC_SUBDIRS = $(PROJECT_TESTSRC_PATH) +PROJECT_BIN_PATH = bin +#PROJECT_DOCS_PATH = docs +#PROJECT_DOXYFILE_PATH = Doxyfile -# Project Library Defines -PROJECT_LIB_VER_MAJOR = 0 -PROJECT_LIB_VER_MINOR = 1 -PROJECT_LIB_VER_PATCH = 0 -PROJECT_SONAME = $(PROJECT_NAME).so.$(PROJECT_LIB_VER_MAJOR) -PROJECT_SO_FILENAME = $(PROJECT_SONAME).$(PROJECT_LIB_VER_MINOR).$(PROJECT_LIB_VER_PATCH) - -# Project Dependencies -PROJECT_DEPEND = nintendo-hac-hb nintendo-hac nintendo-es nintendo-pki fnd polarssl lz4 - -# Check if this is the root makefile +# Determine if the root makefile has been established, and if not establish this makefile as the root makefile ifeq ($(ROOT_PROJECT_NAME),) export ROOT_PROJECT_NAME = $(PROJECT_NAME) export ROOT_PROJECT_PATH = $(PROJECT_PATH) export ROOT_PROJECT_DEPENDENCY_PATH = $(ROOT_PROJECT_PATH)/deps endif -# Compiler Flags +# Shared Library Definitions +PROJECT_SONAME = $(PROJECT_NAME).so.$(PROJECT_VER_MAJOR) +PROJECT_SO_FILENAME = $(PROJECT_SONAME).$(PROJECT_VER_MINOR).$(PROJECT_VER_PATCH) + +# Project Dependencies +PROJECT_DEPEND_LOCAL = nintendo-hac-hb nintendo-hac nintendo-es nintendo-pki fnd polarssl lz4 +PROJECT_DEPEND_EXTERNAL = + +# Generate compiler flags for including project include path ifneq ($(PROJECT_INCLUDE_PATH),) INC += -I"$(PROJECT_INCLUDE_PATH)" endif -ifneq ($(PROJECT_DEPEND),) - LIB += $(foreach dep,$(PROJECT_DEPEND), -L"$(ROOT_PROJECT_DEPENDENCY_PATH)/lib$(dep)/bin" -l$(dep)) - INC += $(foreach dep,$(PROJECT_DEPEND), -I"$(ROOT_PROJECT_DEPENDENCY_PATH)/lib$(dep)/include") + +# Generate compiler flags for local included dependencies +ifneq ($(PROJECT_DEPEND_LOCAL),) + LIB += $(foreach dep,$(PROJECT_DEPEND_LOCAL), -L"$(ROOT_PROJECT_DEPENDENCY_PATH)/lib$(dep)/bin" -l$(dep)) + INC += $(foreach dep,$(PROJECT_DEPEND_LOCAL), -I"$(ROOT_PROJECT_DEPENDENCY_PATH)/lib$(dep)/include") endif -CXXFLAGS = -std=c++11 $(INC) -fPIC -D__STDC_FORMAT_MACROS -Wall -Wno-unused-value -CFLAGS = -std=c11 $(INC) -fPIC -Wall -Wno-unused-value -ARFLAGS = cr -o -ifeq ($(OS),Windows_NT) - # Windows Only Flags/Libs - CC = x86_64-w64-mingw32-gcc - CXX = x86_64-w64-mingw32-g++ - CFLAGS += -Wno-unused-but-set-variable - CXXFLAGS += -Wno-unused-but-set-variable - LIB += -static -else - UNAME = $(shell uname -s) - ifeq ($(UNAME), Darwin) - # MacOS Only Flags/Libs - CFLAGS += -Wno-unused-private-field - CXXFLAGS += -Wno-unused-private-field - LIB += - ARFLAGS = rc - else - # *nix Only Flags/Libs - CFLAGS += -Wno-unused-but-set-variable - CXXFLAGS += -Wno-unused-but-set-variable - LIB += - endif + +# Generate compiler flags for external dependencies +ifneq ($(PROJECT_DEPEND_EXTERNAL),) + LIB += $(foreach dep,$(PROJECT_DEPEND_EXTERNAL), -l$(dep)) endif -ifeq ($(OS),Windows_NT) - # Windows Only Flags/Libs - CC = x86_64-w64-mingw32-gcc - CXX = x86_64-w64-mingw32-g++ - CFLAGS += -Wno-unused-but-set-variable - CXXFLAGS += -Wno-unused-but-set-variable - LIBS += -static -else - UNAME = $(shell uname -s) - ifeq ($(UNAME), Darwin) - # MacOS Only Flags/Libs - CFLAGS += -Wno-unused-private-field - CXXFLAGS += -Wno-unused-private-field - LIBS += + +# Generate compiler flags for program/library version +PROJECT_VER_DEF = -DPROJECT_VER_MAJOR=$(PROJECT_VER_MAJOR) -DPROJECT_VER_MINOR=$(PROJECT_VER_MINOR) -DPROJECT_VER_PATCH=$(PROJECT_VER_PATCH) + +# Detect Platform +ifeq ($(PROJECT_PLATFORM),) + ifeq ($(OS), Windows_NT) + export PROJECT_PLATFORM = WIN32 else - # *nix Only Flags/Libs - CFLAGS += -Wno-unused-but-set-variable - CXXFLAGS += -Wno-unused-but-set-variable - LIBS += + UNAME = $(shell uname -s) + ifeq ($(UNAME), Darwin) + export PROJECT_PLATFORM = MACOS + else + export PROJECT_PLATFORM = GNU + endif endif endif +# Generate platform specific compiler flags +ifeq ($(PROJECT_PLATFORM), WIN32) + # Windows Flags/Libs + CC = x86_64-w64-mingw32-gcc + CXX = x86_64-w64-mingw32-g++ + WARNFLAGS = -Wall -Wno-unused-value -Wno-unused-but-set-variable + INC += + LIB += -static + ARFLAGS = cr -o +else ifeq ($(PROJECT_PLATFORM), GNU) + # GNU/Linux Flags/Libs + #CC = + #CXX = + WARNFLAGS = -Wall -Wno-unused-value -Wno-unused-but-set-variable + INC += + LIB += + ARFLAGS = cr -o +else ifeq ($(PROJECT_PLATFORM), MACOS) + # MacOS Flags/Libs + #CC = + #CXX = + WARNFLAGS = -Wall -Wno-unused-value -Wno-unused-private-field + INC += + LIB += + ARFLAGS = rc +endif + +# Compiler Flags +CXXFLAGS = -std=c++11 $(INC) $(PROJECT_VER_DEF) $(WARNFLAGS) -fPIC +CFLAGS = -std=c11 $(INC) $(PROJECT_VER_DEF) $(WARNFLAGS) -fPIC + # Object Files -SRC_DIR = $(PROJECT_SRC_PATH) -SRC_OBJ = $(foreach dir,$(SRC_DIR),$(subst .cpp,.o,$(wildcard $(dir)/*.cpp))) -TEST_DIR = $(PROJECT_TEST_PATH) -TEST_OBJ = $(foreach dir,$(TEST_DIR),$(subst .cpp,.o,$(wildcard $(dir)/*.cpp))) +SRC_OBJ = $(foreach dir,$(PROJECT_SRC_SUBDIRS),$(subst .cpp,.o,$(wildcard $(dir)/*.cpp))) $(foreach dir,$(PROJECT_SRC_SUBDIRS),$(subst .c,.o,$(wildcard $(dir)/*.c))) +TESTSRC_OBJ = $(foreach dir,$(PROJECT_TESTSRC_SUBDIRS),$(subst .cpp,.o,$(wildcard $(dir)/*.cpp))) $(foreach dir,$(PROJECT_TESTSRC_SUBDIRS),$(subst .c,.o,$(wildcard $(dir)/*.c))) # all is the default, user should specify what the default should do # - 'static_lib' for building static library @@ -94,49 +110,71 @@ TEST_OBJ = $(foreach dir,$(TEST_DIR),$(subst .cpp,.o,$(wildcard $(dir)/*.cpp))) # These can typically be used together however *_lib and program should not be used together all: program -clean: clean_objs clean_bin_dir +clean: clean_object_files remove_binary_dir + +# Object Compile Rules +%.o: %.c + @echo CC $< + @$(CC) $(CFLAGS) -c $< -o $@ + +%.o: %.cpp + @echo CXX $< + @$(CXX) $(CXXFLAGS) -c $< -o $@ # Binary Directory -.PHONY: bin_dir -bin_dir: +.PHONY: create_binary_dir +create_binary_dir: @mkdir -p "$(PROJECT_BIN_PATH)" -.PHONY: clean_bin_dir -clean_bin_dir: +.PHONY: remove_binary_dir +remove_binary_dir: +ifneq ($(PROJECT_BIN_PATH),) @rm -rf "$(PROJECT_BIN_PATH)" +endif -.PHONY: clean_objs -clean_objs: - @rm -f $(SRC_OBJ) $(TEST_OBJ) +.PHONY: clean_object_files +clean_object_files: + @rm -f $(SRC_OBJ) $(TESTSRC_OBJ) # Build Library -static_lib: $(SRC_OBJ) bin_dir - ar $(ARFLAGS) "$(PROJECT_BIN_PATH)/$(PROJECT_NAME).a" $(SRC_OBJ) +static_lib: $(SRC_OBJ) create_binary_dir + @echo LINK $(PROJECT_BIN_PATH)/$(PROJECT_NAME).a + @ar $(ARFLAGS) "$(PROJECT_BIN_PATH)/$(PROJECT_NAME).a" $(SRC_OBJ) -shared_lib: $(SRC_OBJ) bin_dir - gcc -shared -Wl,-soname,$(PROJECT_SONAME) -o "$(PROJECT_BIN_PATH)/$(PROJECT_SO_FILENAME)" $(SRC_OBJ) +shared_lib: $(SRC_OBJ) create_binary_dir + @echo LINK $(PROJECT_BIN_PATH)/$(PROJECT_SO_FILENAME) + @gcc -shared -Wl,-soname,$(PROJECT_SONAME) -o "$(PROJECT_BIN_PATH)/$(PROJECT_SO_FILENAME)" $(SRC_OBJ) # Build Program -program: $(SRC_OBJ) bin_dir - $(CXX) $(SRC_OBJ) $(LIB) -o "$(PROJECT_BIN_PATH)/$(PROJECT_NAME)" +program: $(SRC_OBJ) create_binary_dir + @echo LINK $(PROJECT_BIN_PATH)/$(PROJECT_NAME) + @$(CXX) $(SRC_OBJ) $(LIB) -o "$(PROJECT_BIN_PATH)/$(PROJECT_NAME)" # Build Test Program -test_program: $(TEST_OBJ) $(SRC_OBJ) bin_dir - $(CXX) $(TEST_OBJ) $(SRC_OBJ) $(LIB) -o "$(PROJECT_BIN_PATH)/$(PROJECT_NAME)_test" +test_program: $(TESTSRC_OBJ) $(SRC_OBJ) create_binary_dir +ifneq ($(PROJECT_TESTSRC_PATH),) + @echo LINK $(PROJECT_BIN_PATH)/$(PROJECT_NAME)_test + @$(CXX) $(TESTSRC_OBJ) $(SRC_OBJ) $(LIB) -o "$(PROJECT_BIN_PATH)/$(PROJECT_NAME)_test" +endif # Documentation +.PHONY: docs docs: - doxygen $(PROJECT_DOXYFILE_PATH) +ifneq ($(PROJECT_DOCS_PATH),) + doxygen "$(PROJECT_DOXYFILE_PATH)" +endif .PHONY: clean_docs clean_docs: - @rm -rf $(PROJECT_DOCS_PATH) +ifneq ($(PROJECT_DOCS_PATH),) + @rm -rf "$(PROJECT_DOCS_PATH)" +endif # Dependencies -.PHONY: build_deps -build_deps: - @$(foreach lib,$(PROJECT_DEPEND), cd $(ROOT_PROJECT_DEPENDENCY_PATH)/lib$(lib) && $(MAKE) static_lib && cd $(PROJECT_PATH);) +.PHONY: deps +deps: + @$(foreach lib,$(PROJECT_DEPEND_LOCAL), cd "$(ROOT_PROJECT_DEPENDENCY_PATH)/lib$(lib)" && $(MAKE) static_lib && cd "$(PROJECT_PATH)";) .PHONY: clean_deps clean_deps: - @$(foreach lib,$(PROJECT_DEPEND), cd $(ROOT_PROJECT_DEPENDENCY_PATH)/lib$(lib) && $(MAKE) clean && cd $(PROJECT_PATH);) \ No newline at end of file + @$(foreach lib,$(PROJECT_DEPEND_LOCAL), cd "$(ROOT_PROJECT_DEPENDENCY_PATH)/lib$(lib)" && $(MAKE) clean && cd "$(PROJECT_PATH)";) \ No newline at end of file From 700c8d3d7b4accf36af13be97f79d679042cae9d Mon Sep 17 00:00:00 2001 From: jakcron Date: Sun, 17 Feb 2019 15:22:07 +0800 Subject: [PATCH 2/6] Update .gitignore to ignore .DS_Store --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index acccb6a..2498fdd 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ bin/* *.o *.a *.so.* +.DS_Store ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. From d6dd5f19940cf35d718b77ec65209ae3ece55b31 Mon Sep 17 00:00:00 2001 From: jakcron Date: Sun, 17 Feb 2019 15:22:43 +0800 Subject: [PATCH 3/6] Update build instructions --- BUILDING.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BUILDING.md b/BUILDING.md index 2d94e78..ba5df5c 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -7,7 +7,10 @@ ### Using Makefile * `make` (default) - Compile program + * Compiling the program requires local dependencies to be compiled via `make deps` beforehand * `make clean` - Remove executable and object files +* `make deps` - Compile locally included dependency libraries +* `make clean_deps` - Remove compiled library binaries and object files ## Native Win32 - Visual Studio ### Requirements @@ -15,5 +18,5 @@ ### Compiling NSTool * Open `build/visualstudio/nstool.sln` in Visual Studio -* Select Target (e.g `Debug`|`Release` & `x64`) +* Select Target (e.g `Debug`|`Release` & `x86`|`x64`) * Navigate to `Build`->`Build Solution` \ No newline at end of file From 16070e4ee7622b2fee31c43911de8b5bdd9da3d0 Mon Sep 17 00:00:00 2001 From: jakcron Date: Sun, 17 Feb 2019 15:30:17 +0800 Subject: [PATCH 4/6] Bump version --- makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefile b/makefile index c230d81..d519290 100644 --- a/makefile +++ b/makefile @@ -6,7 +6,7 @@ PROJECT_NAME = nstool PROJECT_VER_MAJOR = 1 PROJECT_VER_MINOR = 1 -PROJECT_VER_PATCH = 0 +PROJECT_VER_PATCH = 1 # Project Relative Paths PROJECT_PATH = $(CURDIR) From eaafc494c940f024b3295f98d6103ffea5b12bb0 Mon Sep 17 00:00:00 2001 From: jakcron Date: Wed, 27 Feb 2019 13:51:06 +0800 Subject: [PATCH 5/6] Fix makefile --- makefile | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/makefile b/makefile index d519290..fafc39f 100644 --- a/makefile +++ b/makefile @@ -1,12 +1,9 @@ # C++/C Recursive Project Makefile # (c) Jack -# Version 2 +# Version 3 -# Project Defines +# Project Name PROJECT_NAME = nstool -PROJECT_VER_MAJOR = 1 -PROJECT_VER_MINOR = 1 -PROJECT_VER_PATCH = 1 # Project Relative Paths PROJECT_PATH = $(CURDIR) @@ -27,8 +24,11 @@ ifeq ($(ROOT_PROJECT_NAME),) endif # Shared Library Definitions -PROJECT_SONAME = $(PROJECT_NAME).so.$(PROJECT_VER_MAJOR) -PROJECT_SO_FILENAME = $(PROJECT_SONAME).$(PROJECT_VER_MINOR).$(PROJECT_VER_PATCH) +PROJECT_SO_VER_MAJOR = 0 +PROJECT_SO_VER_MINOR = 1 +PROJECT_SO_VER_PATCH = 0 +PROJECT_SONAME = $(PROJECT_NAME).so.$(PROJECT_SO_VER_MAJOR) +PROJECT_SO_FILENAME = $(PROJECT_SONAME).$(PROJECT_SO_VER_MINOR).$(PROJECT_SO_VER_PATCH) # Project Dependencies PROJECT_DEPEND_LOCAL = nintendo-hac-hb nintendo-hac nintendo-es nintendo-pki fnd polarssl lz4 @@ -50,9 +50,6 @@ ifneq ($(PROJECT_DEPEND_EXTERNAL),) LIB += $(foreach dep,$(PROJECT_DEPEND_EXTERNAL), -l$(dep)) endif -# Generate compiler flags for program/library version -PROJECT_VER_DEF = -DPROJECT_VER_MAJOR=$(PROJECT_VER_MAJOR) -DPROJECT_VER_MINOR=$(PROJECT_VER_MINOR) -DPROJECT_VER_PATCH=$(PROJECT_VER_PATCH) - # Detect Platform ifeq ($(PROJECT_PLATFORM),) ifeq ($(OS), Windows_NT) @@ -95,8 +92,8 @@ else ifeq ($(PROJECT_PLATFORM), MACOS) endif # Compiler Flags -CXXFLAGS = -std=c++11 $(INC) $(PROJECT_VER_DEF) $(WARNFLAGS) -fPIC -CFLAGS = -std=c11 $(INC) $(PROJECT_VER_DEF) $(WARNFLAGS) -fPIC +CXXFLAGS = -std=c++11 $(INC) $(WARNFLAGS) -fPIC +CFLAGS = -std=c11 $(INC) $(WARNFLAGS) -fPIC # Object Files SRC_OBJ = $(foreach dir,$(PROJECT_SRC_SUBDIRS),$(subst .cpp,.o,$(wildcard $(dir)/*.cpp))) $(foreach dir,$(PROJECT_SRC_SUBDIRS),$(subst .c,.o,$(wildcard $(dir)/*.c))) From 6bf8c4054b8a9c979320f63272ed24b6df1e9dce Mon Sep 17 00:00:00 2001 From: jakcron Date: Thu, 28 Feb 2019 17:26:56 +0800 Subject: [PATCH 6/6] Update dependencies. --- deps/libfnd | 2 +- deps/liblz4 | 2 +- deps/libnintendo-es | 2 +- deps/libnintendo-hac | 2 +- deps/libnintendo-hac-hb | 2 +- deps/libnintendo-pki | 2 +- deps/libpolarssl | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deps/libfnd b/deps/libfnd index 8f0fc94..a3da67f 160000 --- a/deps/libfnd +++ b/deps/libfnd @@ -1 +1 @@ -Subproject commit 8f0fc940fc01198fd24ff3301841ede089c9ada4 +Subproject commit a3da67f8bcbf794e3689b0496695a249e323b6e8 diff --git a/deps/liblz4 b/deps/liblz4 index fedcdbf..1dbb4a7 160000 --- a/deps/liblz4 +++ b/deps/liblz4 @@ -1 +1 @@ -Subproject commit fedcdbf5b4ac47aa09f7d9b0e665c2ae38c6edff +Subproject commit 1dbb4a7988f91f0dbe854cb841b4ad5cdaff912e diff --git a/deps/libnintendo-es b/deps/libnintendo-es index 034d24c..5b46763 160000 --- a/deps/libnintendo-es +++ b/deps/libnintendo-es @@ -1 +1 @@ -Subproject commit 034d24c54f6d0b090865d187e8e454a126791816 +Subproject commit 5b46763f7c35111bc67406ecadb4381436aa62b8 diff --git a/deps/libnintendo-hac b/deps/libnintendo-hac index 324f45d..71f5f5d 160000 --- a/deps/libnintendo-hac +++ b/deps/libnintendo-hac @@ -1 +1 @@ -Subproject commit 324f45d08b4d39157729e84429e95c9891224f3f +Subproject commit 71f5f5d9488bf24ee3c9196911880c5ecda7c0cc diff --git a/deps/libnintendo-hac-hb b/deps/libnintendo-hac-hb index f0c9854..dc434e4 160000 --- a/deps/libnintendo-hac-hb +++ b/deps/libnintendo-hac-hb @@ -1 +1 @@ -Subproject commit f0c9854c00880c26a52645ab4cb027653c67a3be +Subproject commit dc434e4605476c40f584e6e98f54fdd980eba2eb diff --git a/deps/libnintendo-pki b/deps/libnintendo-pki index 589465a..509300a 160000 --- a/deps/libnintendo-pki +++ b/deps/libnintendo-pki @@ -1 +1 @@ -Subproject commit 589465a7e8b410739004b5e4c9fa814cb0365286 +Subproject commit 509300a121626a9221f2d8af42a06723481ebf33 diff --git a/deps/libpolarssl b/deps/libpolarssl index 1ab999e..6573a1b 160000 --- a/deps/libpolarssl +++ b/deps/libpolarssl @@ -1 +1 @@ -Subproject commit 1ab999e3f9f7d95aeed963dddf7d0f4b34e68110 +Subproject commit 6573a1bd54a6a13bd468c6e17e631332eaff4449