This commit is contained in:
HookedBehemoth 2019-11-22 18:40:15 +01:00
parent fe18b58f9a
commit f517f179d8
2 changed files with 7 additions and 7 deletions

View file

@ -55,7 +55,7 @@ ARCH := -march=armv8-a+crc+crypto -mtune=cortex-a57 -mtp=soft -fPIE
CFLAGS := -g -Wall -O2 -ffunction-sections \
$(ARCH) $(DEFINES)
CFLAGS += $(INCLUDE) -D__SWITCH__ -D__DEBUG__ -DNXLINK_DEBUG
CFLAGS += $(INCLUDE) -D__SWITCH__ -D__DEBUG__
CXXFLAGS := $(CFLAGS) -fno-rtti -std=gnu++17
@ -166,17 +166,17 @@ all: $(BUILD)
$(BUILD):
@[ -d $@ ] || mkdir -p $@
#comment this out if you are hacking on the code or compilation will take for ever
$(MAKE) --no-print-directory -C include/Plutonium -f Makefile lib-switch
#$(MAKE) --no-print-directory -C include/Plutonium -f Makefile lib-switch
@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
#---------------------------------------------------------------------------------
clean:
@echo clean ...
ifeq ($(strip $(APP_JSON)),)
@$(MAKE) --no-print-directory -C include/Plutonium/Plutonium -f Makefile clean
#@$(MAKE) --no-print-directory -C include/Plutonium/Plutonium -f Makefile clean
@rm -fr $(BUILD) $(TARGET).nro $(TARGET).nacp $(TARGET).elf
else
@$(MAKE) --no-print-directory -C include/Plutonium/Plutonium -f Makefile clean
#@$(MAKE) --no-print-directory -C include/Plutonium/Plutonium -f Makefile clean
@rm -fr $(BUILD) $(TARGET).nsp $(TARGET).nso $(TARGET).npdm $(TARGET).elf
endif

View file

@ -31,7 +31,7 @@ namespace tin::install
u8 _0x148[0xB8]; /* Padding. */
} PACKED;
static_assert(sizeof(NcaFsHeader) == 0x200, "PFS0FileEntry must be 0x18");
static_assert(sizeof(NcaFsHeader) == 0x200, "NcaFsHeader must be 0x200");
struct NcaSectionEntry
{
@ -40,7 +40,7 @@ namespace tin::install
u8 _0x8[0x8]; /* Padding. */
} PACKED;
static_assert(sizeof(NcaSectionEntry) == 0x10, "PFS0FileEntry must be 0x18");
static_assert(sizeof(NcaSectionEntry) == 0x10, "NcaSectionEntry must be 0x10");
struct NcaHeader
{
@ -73,5 +73,5 @@ namespace tin::install
NcaFsHeader fs_headers[4]; /* FS section headers. */
} PACKED;
static_assert(sizeof(NcaHeader) == 0xc00, "PFS0FileEntry must be 0x18");
static_assert(sizeof(NcaHeader) == 0xc00, "NcaHeader must be 0xc00");
}