Moved libn3ds to libraries/libn3ds.
Include libn3ds license in releases and nightlies.
This commit is contained in:
parent
cdacbc7dc5
commit
6298503e6b
|
@ -1,3 +1,3 @@
|
|||
[submodule "libn3ds"]
|
||||
path = libn3ds
|
||||
url = https://github.com/profi200/libn3ds
|
||||
[submodule "libraries/libn3ds"]
|
||||
path = libraries/libn3ds
|
||||
url = https://github.com/profi200/libn3ds.git
|
||||
|
|
7
Makefile
7
Makefile
|
@ -82,8 +82,8 @@ else
|
|||
endif
|
||||
@7z a -mx -m0=ARM -m1=LZMA $(TARGET)$(VERS_STRING).7z $(TARGET).firm
|
||||
@7z u -mx -m0=LZMA $(TARGET)$(VERS_STRING).7z resources/gba_db.bin
|
||||
@7z u -mx -m0=PPMD $(TARGET)$(VERS_STRING).7z libn3ds/libraries/fatfs/LICENSE.txt libraries/inih/LICENSE.txt LICENSE.txt README.md
|
||||
@7z rn $(TARGET)$(VERS_STRING).7z resources/gba_db.bin 3ds/open_agb_firm/gba_db.bin libn3ds/libraries/fatfs/LICENSE.txt LICENSE_FatFs.txt libraries/inih/LICENSE.txt LICENSE_inih.txt
|
||||
@7z u -mx -m0=PPMD $(TARGET)$(VERS_STRING).7z libraries/libn3ds/LICENSE.txt libraries/libn3ds/libraries/fatfs/LICENSE.txt libraries/inih/LICENSE.txt LICENSE.txt README.md
|
||||
@7z rn $(TARGET)$(VERS_STRING).7z resources/gba_db.bin 3ds/open_agb_firm/gba_db.bin libraries/libn3ds/LICENSE.txt LICENSE_libn3ds.txt libraries/libn3ds/libraries/fatfs/LICENSE.txt LICENSE_FatFs.txt libraries/inih/LICENSE.txt LICENSE_inih.txt
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
nightly: clean
|
||||
|
@ -99,5 +99,6 @@ endif
|
|||
@mkdir -p nightly/3ds/open_agb_firm
|
||||
@cp -t nightly $(TARGET).firm LICENSE.txt README.md
|
||||
@cp resources/gba_db.bin nightly/3ds/open_agb_firm
|
||||
@cp libn3ds/libraries/fatfs/LICENSE.txt nightly/LICENSE_FatFs.txt
|
||||
@cp libraries/libn3ds/LICENSE.txt nightly/LICENSE_libn3ds.txt
|
||||
@cp libraries/libn3ds/libraries/fatfs/LICENSE.txt nightly/LICENSE_FatFs.txt
|
||||
@cp libraries/inih/LICENSE.txt nightly/LICENSE_inih.txt
|
||||
|
|
|
@ -8,7 +8,7 @@ endif
|
|||
|
||||
TOPDIR ?= $(CURDIR)
|
||||
include $(DEVKITARM)/base_rules
|
||||
include $(TOPDIR)/../libn3ds/libn3ds11.mk
|
||||
include $(TOPDIR)/../libraries/libn3ds/libn3ds11.mk
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# TARGET is the name of the output
|
||||
|
|
|
@ -8,7 +8,7 @@ endif
|
|||
|
||||
TOPDIR ?= $(CURDIR)
|
||||
include $(DEVKITARM)/base_rules
|
||||
include $(TOPDIR)/../libn3ds/libn3ds9.mk
|
||||
include $(TOPDIR)/../libraries/libn3ds/libn3ds9.mk
|
||||
|
||||
#---------------------------------------------------------------------------------
|
||||
# TARGET is the name of the output
|
||||
|
|
1
libn3ds
1
libn3ds
|
@ -1 +0,0 @@
|
|||
Subproject commit 51edfdab98c322275255e3aa20361ca1b4e8e798
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 4af76dbf8826ca15796b08676ff929d17b500863
|
Loading…
Reference in New Issue