me/IronOS
1
0
Fork 1
mirror of https://github.com/Ralim/IronOS.git synced 2025-02-26 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into BLE

Browse Source
This commit is contained in:
Ben V. Brown
2023-01-23 17:22:06 +11:00
committed by GitHub
parent c5d92efa60 f28ca72f7c
commit 4e37c7bea7
63 changed files with 9197 additions and 12868 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/Makefile
View File

@@ -606,7 +606,7 @@ $(OUT_OBJS_S): $(OUTPUT_DIR)/%.o: %.S Makefile
Core/Gen/Translation.%.cpp $(OUTPUT_DIR)/Core/Gen/translation.files/%.pickle: ../Translations/translation_%.json \
../Translations/make_translation.py \
../Translations/translations_def.js \
../Translations/translations_definitions.json \
../Translations/font_tables.py \
Makefile ../Translations/wqy-bitmapsong/wenquanyi_9pt.bdf
@test -d Core/Gen || mkdir -p Core/Gen
@@ -687,7 +687,7 @@ $(HEXFILE_DIR)/$(model)_multi_compressed_$(2).elf : \
Core/Gen/Translation_multi.$(1).cpp: $(patsubst %,../Translations/translation_%.json,$(3)) \
../Translations/make_translation.py \
../Translations/translations_def.js \
../Translations/translations_definitions.json \
../Translations/font_tables.py \
Makefile ../Translations/wqy-bitmapsong/wenquanyi_9pt.bdf
@test -d Core/Gen || mkdir -p Core/Gen