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

[Change] OMEGA_THEME_* to THEME_*

Browse Source
This commit is contained in:
Quentin
2020-06-23 17:35:39 +02:00
parent ea75f8ac26
commit 1f3ad54c05
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -35,8 +35,8 @@ info:
@echo "EPSILON_VERSION = $(EPSILON_VERSION)" @echo "EPSILON_VERSION = $(EPSILON_VERSION)"
@echo "EPSILON_APPS = $(EPSILON_APPS)" @echo "EPSILON_APPS = $(EPSILON_APPS)"
@echo "EPSILON_I18N = $(EPSILON_I18N)" @echo "EPSILON_I18N = $(EPSILON_I18N)"
@echo "OMEGA_THEME_NAME = $(OMEGA_THEME_NAME)" @echo "THEME_NAME = $(THEME_NAME)"
@echo "OMEGA_THEME_REPO = $(OMEGA_THEME_REPO)" @echo "THEME_REPO = $(THEME_REPO)"
@echo "BUILD_DIR = $(BUILD_DIR)" @echo "BUILD_DIR = $(BUILD_DIR)"
@echo "PLATFORM" = $(PLATFORM) @echo "PLATFORM" = $(PLATFORM)
@echo "DEBUG" = $(DEBUG) @echo "DEBUG" = $(DEBUG)

8
apps/Makefile
View File

@@ -107,12 +107,12 @@ apps_tests_src += $(addprefix apps/,\
global_preferences.cpp \ global_preferences.cpp \
) )
ifeq ($(OMEGA_THEME_REPO),local) ifeq ($(THEME_REPO),local)
$(foreach img,$(image_list), $(eval $(call rule_for, \ $(foreach img,$(image_list), $(eval $(call rule_for, \
ICON, \ ICON, \
$(img), \ $(img), \
$(addprefix themes/themes/local/, $(addsuffix .json, $(OMEGA_THEME_NAME))), \ $(addprefix themes/themes/local/, $(addsuffix .json, $(THEME_NAME))), \
$$(PYTHON) themes/themes_manager.py -i $(OMEGA_THEME_REPO) $(OMEGA_THEME_NAME) $$@ $(BUILD_DIR)/, \ $$(PYTHON) themes/themes_manager.py -i $(THEME_REPO) $(THEME_NAME) $$@ $(BUILD_DIR)/, \
global \ global \
))) )))
else else
@@ -120,7 +120,7 @@ $(foreach img,$(image_list), $(eval $(call rule_for, \
ICON, \ ICON, \
$(img), \ $(img), \
$(addsuffix /escher/palette.h, $(BUILD_DIR)), \ $(addsuffix /escher/palette.h, $(BUILD_DIR)), \
$$(PYTHON) themes/themes_manager.py -i $(OMEGA_THEME_REPO) $(OMEGA_THEME_NAME) $$@ $(BUILD_DIR)/, \ $$(PYTHON) themes/themes_manager.py -i $(THEME_REPO) $(THEME_NAME) $$@ $(BUILD_DIR)/, \
global \ global \
))) )))
endif endif

4
build/config.mak
View File

@@ -13,6 +13,6 @@ EPSILON_I18N ?= en fr es de pt hu
EPSILON_GETOPT ?= 0 EPSILON_GETOPT ?= 0
EPSILON_TELEMETRY ?= 0 EPSILON_TELEMETRY ?= 0
ESCHER_LOG_EVENTS_BINARY ?= 0 ESCHER_LOG_EVENTS_BINARY ?= 0
OMEGA_THEME_NAME ?= omega_light THEME_NAME ?= omega_light
OMEGA_THEME_REPO ?= local THEME_REPO ?= local
LEDS_CHOICE ?= 0 LEDS_CHOICE ?= 0

8
escher/Makefile
View File

@@ -1,11 +1,11 @@
SFLAGS += -Iescher/include SFLAGS += -Iescher/include
ifeq ($(OMEGA_THEME_REPO),local) ifeq ($(THEME_REPO),local)
$(eval $(call rule_for, \ $(eval $(call rule_for, \
THEME, \ THEME, \
escher/palette.h, \ escher/palette.h, \
$(addprefix themes/themes/local/, $(addsuffix .json, $(OMEGA_THEME_NAME))), \ $(addprefix themes/themes/local/, $(addsuffix .json, $(THEME_NAME))), \
$$(PYTHON) themes/themes_manager.py $(OMEGA_THEME_REPO) $(OMEGA_THEME_NAME) $$@ $(BUILD_DIR)/, \ $$(PYTHON) themes/themes_manager.py $(THEME_REPO) $(THEME_NAME) $$@ $(BUILD_DIR)/, \
global \ global \
)) ))
else else
@@ -13,7 +13,7 @@ $(eval $(call rule_for, \
THEME, \ THEME, \
escher/palette.h, \ escher/palette.h, \
themes/themes/git/.empty-folder, \ themes/themes/git/.empty-folder, \
$$(PYTHON) themes/themes_manager.py $(OMEGA_THEME_REPO) $(OMEGA_THEME_NAME) $$@ $(BUILD_DIR)/, \ $$(PYTHON) themes/themes_manager.py $(THEME_REPO) $(THEME_NAME) $$@ $(BUILD_DIR)/, \
global \ global \
)) ))
endif endif