From e92c6e536b9f012def42220b24e954eeb23a7724 Mon Sep 17 00:00:00 2001 From: Pablo Curiel Date: Thu, 25 Mar 2021 22:49:59 -0400 Subject: [PATCH] Add Borealis as a git submodule. --- .gitmodules | 6 +++++- Makefile | 8 +++++--- libs/borealis | 1 + libusbhsfs => libs/libusbhsfs | 0 4 files changed, 11 insertions(+), 4 deletions(-) create mode 160000 libs/borealis rename libusbhsfs => libs/libusbhsfs (100%) diff --git a/.gitmodules b/.gitmodules index 739d4b4..eac85c4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,8 @@ [submodule "libusbhsfs"] - path = libusbhsfs + path = libs/libusbhsfs url = https://github.com/DarkMatterCore/libusbhsfs branch = dev +[submodule "libs/borealis"] + path = libs/borealis + url = https://github.com/natinusala/borealis + branch = main diff --git a/Makefile b/Makefile index 77f0064..5e84d02 100644 --- a/Makefile +++ b/Makefile @@ -76,11 +76,13 @@ LDFLAGS = -specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $* LIBS := -lcurl -lmbedtls -lmbedx509 -lmbedcrypto -lxml2 -lz -lusbhsfs -lntfs-3g -llwext4 -lnx -ljson-c -lm -lturbojpeg +LIBUSBHSFS_DIR := $(CURDIR)/libs/libusbhsfs + #--------------------------------------------------------------------------------- # list of directories containing libraries, this must be the top level containing # include and lib #--------------------------------------------------------------------------------- -LIBDIRS := $(PORTLIBS) $(LIBNX) $(CURDIR)/libusbhsfs +LIBDIRS := $(PORTLIBS) $(LIBNX) $(LIBUSBHSFS_DIR) #--------------------------------------------------------------------------------- @@ -165,7 +167,7 @@ endif all: $(BUILD) usbhsfs: - @$(MAKE) --no-print-directory -C libusbhsfs BUILD_TYPE=GPL release + @$(MAKE) --no-print-directory -C $(LIBUSBHSFS_DIR) BUILD_TYPE=GPL release $(BUILD): usbhsfs @[ -d $@ ] || mkdir -p $@ @@ -177,7 +179,7 @@ clean: @rm -fr $(BUILD) *.pfs0 *.nso *.nro *.nacp *.elf clean_all: clean - @$(MAKE) --no-print-directory -C libusbhsfs clean + @$(MAKE) --no-print-directory -C $(LIBUSBHSFS_DIR) clean #--------------------------------------------------------------------------------- else diff --git a/libs/borealis b/libs/borealis new file mode 160000 index 0000000..7a9a085 --- /dev/null +++ b/libs/borealis @@ -0,0 +1 @@ +Subproject commit 7a9a085b9850e56291d71511bc78680e0a5ef5d2 diff --git a/libusbhsfs b/libs/libusbhsfs similarity index 100% rename from libusbhsfs rename to libs/libusbhsfs