From 70142ba64fd60d986d5de7b55af617e2ce5c6317 Mon Sep 17 00:00:00 2001 From: Jaby Blubb Date: Sun, 30 Apr 2023 15:33:12 +0200 Subject: [PATCH] Put RebuildTarget into own file --- examples/PoolBox/PoolBox.code-workspace | 12 ++++++++++++ lib/Makefile | 5 +---- lib/RebuildTarget.mk | 3 +++ 3 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 lib/RebuildTarget.mk diff --git a/examples/PoolBox/PoolBox.code-workspace b/examples/PoolBox/PoolBox.code-workspace index b7f04eff..dd3880a7 100644 --- a/examples/PoolBox/PoolBox.code-workspace +++ b/examples/PoolBox/PoolBox.code-workspace @@ -23,6 +23,18 @@ } } }, + { + "label": "build assets", + "type": "shell", + "command": "wsl make ${input:target} BUILD_PROFILE=${input:build profile} JABY_ENGINE_DIR=$(wslpath ${env:JABY_ENGINE_PATH})", + "group": "build", + "options": { + "cwd": "assets", + "env": { + "PATH": "${env:JABY_ENGINE_PATH}/bin;${env:PATH}" + } + } + }, { "label": "cdgen", "type": "shell", diff --git a/lib/Makefile b/lib/Makefile index b0d342f8..51db17ba 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -87,10 +87,7 @@ $(OUTPUT_DIR)/%.o: $$(subst !super,..,%.s) @mkdir -p $(dir $@) $(CC) $(ARCHFLAGS) -I$(PCSX_REDUX) -g -c -o $@ $< -#Rules section for default compilation and linking -rebuild: - $(MAKE) clean - $(MAKE) all +include $(SELF_DIR)RebuildTarget.mk #Inclusion of dependencies (object files to source and includes) -include $(OBJS:%.o=%.d) \ No newline at end of file diff --git a/lib/RebuildTarget.mk b/lib/RebuildTarget.mk new file mode 100644 index 00000000..c180f356 --- /dev/null +++ b/lib/RebuildTarget.mk @@ -0,0 +1,3 @@ +rebuild: + $(MAKE) clean + $(MAKE) all \ No newline at end of file