Skip to content

Commit

Permalink
Merge 'Fix order in Makefile' (#2243)
Browse files Browse the repository at this point in the history
  • Loading branch information
fenhl committed Aug 12, 2024
2 parents 5b5d26a + da7a106 commit 4b9c614
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions ASM/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,12 @@ $(OBJDIR)/%_bin.o: $(RESOURCEDIR)/%.bin
$(OBJCOPY) --redefine-sym _binary_resources_$*_bin_end=$(call UC,$*)_RESOURCE_END $@
$(OBJCOPY) --redefine-sym _binary_resources_$*_bin_size=$(call UC,$*)_RESOURCE_SIZE $@


$(RESOURCEDIR):
mkdir -p $@

$(OBJECTS): | $(OBJDIR)

$(RESOURCES): | $(RESOURCEDIR)
$(RESOURCES): | $(OBJDIR) $(RESOURCEDIR)

bundle: $(RESOURCES) $(OBJECTS)
$(LD) -T linker_script.ld -T ootSymbols.ld -o $(OUTDIR)/bundle.o -i -L. $(patsubst %.o,-l:%.o,$(OBJECTS) $(RESOURCES))
Expand Down
2 changes: 1 addition & 1 deletion version.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = '8.1.71'
__version__ = '8.1.72'

# This is a supplemental version number for branches based off of main dev.
supplementary_version = 0
Expand Down

0 comments on commit 4b9c614

Please sign in to comment.