[FL-2481] Renamed assets->resources; enforcing Manifest build if it does not exist (#1135)
* Renamed assets->resources; enforcing Manifest build if it does not exist * Rebuild resources from CI * Added Manifest to repo - be sure to rebuild it with `make -C assets` before committing changes! * Actually added Manifest. * Keeping Manifest on assets clean * Spelling fix in Makefile
This commit is contained in:
@@ -1,11 +1,15 @@
|
||||
ASSETS_DIR := $(PROJECT_ROOT)/assets
|
||||
ASSETS_COMPILLER := $(PROJECT_ROOT)/scripts/assets.py
|
||||
ASSETS_COMPILER := $(PROJECT_ROOT)/scripts/assets.py
|
||||
ASSETS_COMPILED_DIR := $(ASSETS_DIR)/compiled
|
||||
ASSETS_SOURCE_DIR := $(ASSETS_DIR)/icons
|
||||
|
||||
ASSETS_SOURCES += $(shell find $(ASSETS_SOURCE_DIR) -type f -iname '*.png' -or -iname 'frame_rate')
|
||||
ASSETS += $(ASSETS_COMPILED_DIR)/assets_icons.c
|
||||
|
||||
RESOURCES_DIR := $(ASSETS_DIR)/resources
|
||||
RESOURCES_MANIFEST := $(RESOURCES_DIR)/Manifest
|
||||
RESOURCES_FILES := $(shell find $(RESOURCES_DIR) ! -name Manifest -type f)
|
||||
|
||||
DOLPHIN_SOURCE_DIR := $(ASSETS_DIR)/dolphin
|
||||
DOLPHIN_INTERNAL_OUTPUT_DIR := $(ASSETS_COMPILED_DIR)
|
||||
DOLPHIN_EXTERNAL_OUTPUT_DIR := $(ASSETS_DIR)/resources/dolphin
|
||||
|
||||
Reference in New Issue
Block a user