Skip to content

Commit

Permalink
Fixed makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
WerWolv committed May 3, 2019
1 parent 97def82 commit cda7333
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ SOURCES := source source/widgets source/guis source/scripting source/ui_element
DATA := data
INCLUDES := include libs/nxpy/include libs/lua/include libs/nlohmann libs/nanojpeg/include libs/minizip/include
EXEFS_SRC := exefs_src
ROMFS := romfs
#ROMFS := romfs

#---------------------------------------------------------------------------------
# options for code generation
Expand Down Expand Up @@ -151,14 +151,14 @@ ifneq ($(ROMFS),)
export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS)
endif

PC = ${pc}
BASE = ${b}
ADDR = $(shell echo $(PC)-$(BASE) | bc)
PC = $(shell printf "%d" ${pc})
BASE = $(shell printf "%d" ${b})
ADDR = $(shell printf "%x" $(shell echo $(PC)-$(BASE) | bc))

.PHONY: $(BUILD) clean all run errline $(ROMFS)

#---------------------------------------------------------------------------------
all: $(BUILD)
all: $(BUILD) $(ROMFS)

$(BUILD):
@[ -d $@ ] || mkdir -p $@ $(BUILD) $(OUTDIR)
Expand All @@ -176,7 +176,7 @@ clean:

#---------------------------------------------------------------------------------
errline:
@aarch64-none-elf-addr2line -e $(OUTPUT).elf -f -p -C -a $(ADDR)
@aarch64-none-elf-addr2line -e $(OUTPUT).elf -f -p -C -a 0x$(ADDR)

#---------------------------------------------------------------------------------
else
Expand All @@ -194,7 +194,7 @@ $(OUTPUT).pfs0 : $(OUTPUT).nso
$(OUTPUT).nso : $(OUTPUT).elf

ifeq ($(strip $(NO_NACP)),)
$(OUTPUT).nro : $(OUTPUT).elf $(ROMFS) $(OUTPUT).nacp
$(OUTPUT).nro : $(OUTPUT).elf $(OUTPUT).nacp
else
$(OUTPUT).nro : $(OUTPUT).elf
endif
Expand Down

0 comments on commit cda7333

Please sign in to comment.