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

Merge branch 'omega-dev' of https://github.com/Omega-Numworks/Omega into omega-dev

Browse Source
This commit is contained in:
M4x1m3
2019-12-24 13:47:21 +01:00
parent 53c7dfee8a eff2ba92a4
commit dd16c9336c
65 changed files with 481 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/Makefile
View File

@@ -93,7 +93,9 @@ $(call object_for,$(all_app_src)): $(BUILD_DIR)/apps/i18n.h
$(call object_for,$(all_app_src)): $(BUILD_DIR)/python/port/genhdr/qstrdefs.generated.h
apps_tests_src = $(app_calculation_test_src) $(app_probability_test_src) $(app_regression_test_src) $(app_sequence_test_src) $(app_shared_test_src) $(app_statistics_test_src) $(app_solver_test_src)
apps_tests_src += $(addprefix apps/,\
global_preferences.cpp \
)
$(foreach img,$(image_list), $(eval $(call rule_for, \
@@ -103,7 +105,6 @@ $(foreach img,$(image_list), $(eval $(call rule_for, \
$$(PYTHON) themes/themes_manager.py -i $(OMEGA_THEME) $$@ $(BUILD_DIR)/ \
)))
# Configure variants
apps_all_src = $(app_src)
apps_all_src += $(apps_launch_default_src) $(apps_launch_on_boarding_src