This commit is contained in:
Maschell 2020-10-17 00:55:14 +02:00
parent 6dc8bbde37
commit 8dabb403ca
4 changed files with 6 additions and 5 deletions

View File

@ -83,7 +83,7 @@ endif
export OFILES_BIN := $(addsuffix .o,$(BINFILES)) export OFILES_BIN := $(addsuffix .o,$(BINFILES))
export OFILES_SRC := $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o) export OFILES_SRC := $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
export OFILES := $(OFILES_BIN) $(OFILES_SRC) safe.rpx.o export OFILES := $(OFILES_BIN) $(OFILES_SRC) root.rpx.o
export HFILES_BIN := $(addsuffix .h,$(subst .,_,$(BINFILES))) export HFILES_BIN := $(addsuffix .h,$(subst .,_,$(BINFILES)))
export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \ export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
@ -99,6 +99,7 @@ all: $(BUILD)
$(BUILD): $(BUILD):
@[ -d $@ ] || mkdir -p $@ @[ -d $@ ] || mkdir -p $@
@$(MAKE) --no-print-directory -C payload
@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile @$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -120,7 +121,7 @@ DEPENDS := $(OFILES:.o=.d)
# main targets # main targets
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
safe_payload := ../payload/safe.rpx safe_payload := ../payload/root.rpx
all : $(OUTPUT).rpx all : $(OUTPUT).rpx

@ -1 +1 @@
Subproject commit 4cc24eda59805aa5d9eda6c7af1262966001efec Subproject commit f0171236eaa5093ccd17894924841bbb2fc6c1e1

View File

@ -210,7 +210,7 @@ void ApplicationState::update(Input *input) {
this->state = STATE_INSTALL_RPX; this->state = STATE_INSTALL_RPX;
} }
} else if (this->state == STATE_INSTALL_RPX) { } else if (this->state == STATE_INSTALL_RPX) {
auto result = InstallerService::copyRPX(this->appInfo->path, safe_rpx, safe_rpx_size, RPX_HASH); auto result = InstallerService::copyRPX(this->appInfo->path, root_rpx, root_rpx_size, RPX_HASH);
if (result != InstallerService::SUCCESS) { if (result != InstallerService::SUCCESS) {
setError(ERROR_INSTALLER_ERROR); setError(ERROR_INSTALLER_ERROR);
this->installerError = result; this->installerError = result;

View File

@ -20,7 +20,7 @@ constexpr bool strings_equal(char const *a, char const *b) {
return std::string_view(a) == b; return std::string_view(a) == b;
} }
static_assert(strings_equal(RPX_HASH, "6ce36d8838cab58a0f90f381119b12aca009974b"), "Built with an untested safe.rpx! Remove this check if you really know what you're doing."); static_assert(strings_equal(RPX_HASH, "2df9282cadcbe3fa86848ade9c67cbff12b72426"), "Built with an untested safe.rpx! Remove this check if you really know what you're doing.");
void initIOSUHax(); void initIOSUHax();