diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2024-09-06 11:01:55 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-06 13:01:55 -0400 |
| commit | d925976c828a2d4cd9a8da01fabf50af6ac68e86 (patch) | |
| tree | 59a7ee7e53b7ee7a9cce6fc75f28ae2a47687551 /Makefile | |
| parent | 629584b1bc5a3573bcc12a21029a6e6c53559d75 (diff) | |
Small Misc Tooling (#1668)
* Move .extracted_assets.json to extracted folder
* .options.mk
* Move extract assets to tools folder
* .make_options.mk
* gitignore as well
* Remove duplicate import
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1,7 +1,7 @@ # Build options can be changed by modifying the makefile or by building with 'make SETTING=value'. -# It is also possible to override the settings in Defaults in a file called .make_options as 'SETTING=value'. +# It is also possible to override the settings in Defaults in a file called .make_options.mk as 'SETTING=value'. --include .make_options +-include .make_options.mk MAKEFLAGS += --no-builtin-rules @@ -433,7 +433,7 @@ assetclean: $(RM) -r $(ASSET_BIN_DIRS) $(RM) -r $(BUILD_DIR)/assets $(RM) -r assets/text/*.h - $(RM) -r .extracted-assets.json + $(RM) -r $(EXTRACTED_DIR)/.extracted-assets.json distclean: assetclean clean $(RM) -r asm data extracted @@ -457,7 +457,7 @@ setup-audio: $(AUDIO_EXTRACT) -o $(EXTRACTED_DIR) -v $(VERSION) --read-xml assets: - $(PYTHON) extract_assets.py $(EXTRACTED_DIR)/baserom assets -j$(N_THREADS) -Z Wno-hardcoded-pointer + $(PYTHON) tools/extract_assets.py $(EXTRACTED_DIR)/baserom assets -j$(N_THREADS) -Z Wno-hardcoded-pointer -v $(VERSION) $(AUDIO_EXTRACT) -o $(EXTRACTED_DIR) -v $(VERSION) --read-xml ## Assembly generation |