UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-18 21:30:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Fix] Fix conflicts ._.

Browse Source
This commit is contained in:
Quentin
2020-04-07 14:53:19 +02:00
parent 3fac1fdf78 42fa0e7fbc
commit aea963dac0
194 changed files with 4774 additions and 1958 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
escher/Makefile
View File

@@ -94,14 +94,16 @@ $(eval $(call rule_for, \
HOSTCC, \
escher/image/inliner, \
escher/image/inliner.c $(addprefix ion/src/external/lz4/, lz4.c lz4hc.c), \
$$(HOSTCC) -std=c99 `libpng-config --cflags` $$^ `libpng-config --ldflags` -o $$@ \
$$(HOSTCC) -std=c99 `libpng-config --cflags` $$^ `libpng-config --ldflags` -o $$@, \
global \
))
$(eval $(call rule_for, \
THEME, \
escher/palette.h, \
$(addprefix themes/themes/, $(addsuffix .json, $(OMEGA_THEME))), \
$$(PYTHON) themes/themes_manager.py $(OMEGA_THEME) $$@ \
$$(PYTHON) themes/themes_manager.py $(OMEGA_THEME) $$@, \
global \
))
INLINER := $(BUILD_DIR)/escher/image/inliner
@@ -111,7 +113,8 @@ $(eval $(call rule_for, \
INLINER, \
%.h %.cpp, \
$(BUILD_DIR)/%.png $$(INLINER), \
$$(INLINER) $$< $$(basename $$@).h $$(basename $$@).cpp \
$$(INLINER) $$< $$(basename $$@).h $$(basename $$@).cpp, \
global \
))
# Mark a .cpp file as depending on a .png one