Skip to content

Commit 408c263

Browse files
committed
Reordered asset build directory clean operation in targets
1 parent 05b5c7c commit 408c263

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

examples/game/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ $(exampleGameBinDir)/%.o: $(exampleGameSrcDir)/%.cpp
6969

7070
# Copy assets directory to the build directory and pack them
7171
pack-assets:
72+
$(RM) "$(exampleGameBuildDir)/assets"
7273
$(call MKDIR,$(call platformpth,$(exampleGameBuildDir)/assets))
7374
$(call COPY,$(exampleGameSrcDir)/assets,$(exampleGameBuildDir)/assets,$(RWCARDGLOB))
7475
$(call MKDIR,$(call platformpth,$(exampleGameBuildDir)/assets/shaders))
7576
$(call COPY,$(binDir)/engine/render/build/assets/shaders,$(exampleGameBuildDir)/assets/shaders,$(RWCARDGLOB))
7677
$(packerApp) $(exampleGameBuildDir)/app.pck $(exampleGameBuildDir) $(exampleGameAssets)
77-
$(RM) "$(exampleGameBuildDir)/assets"
7878
$(call PACK_LIBS_SCRIPT,$(vendorDir)/vulkan/lib,$(exampleGameBuildDir))
7979

8080

examples/render/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ $(exampleRenderBinDir)/%.o: $(exampleRenderSrcDir)/%.cpp
6868

6969
# Copy assets directory to the build directory and pack them
7070
pack-assets:
71+
$(RM) "$(exampleRenderBuildDir)/assets"
7172
$(call MKDIR,$(call platformpth,$(exampleRenderBuildDir)/assets))
7273
$(call COPY,$(exampleRenderSrcDir)/assets,$(exampleRenderBuildDir)/assets,$(RWCARDGLOB))
7374
$(call MKDIR,$(call platformpth,$(exampleRenderBuildDir)/assets/shaders))
7475
$(call COPY,$(binDir)/engine/render/build/assets/shaders,$(exampleRenderBuildDir)/assets/shaders,$(RWCARDGLOB))
7576
$(packerApp) $(exampleRenderBuildDir)/app.pck $(exampleRenderBuildDir) $(exampleRenderAssets)
76-
$(RM) "$(exampleRenderBuildDir)/assets"
7777
$(call PACK_LIBS_SCRIPT,$(vendorDir)/vulkan/lib,$(exampleRenderBuildDir))
7878

7979
# Package the built application and all its assets to the output directory

examples/tilemap/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,12 @@ $(exampleTilemapBinDir)/%.o: $(exampleTilemapSrcDir)/%.cpp
6767

6868
# Copy assets directory to the build directory and pack them
6969
pack-assets:
70+
$(RM) "$(exampleTilemapBuildDir)/assets"
7071
$(call MKDIR,$(call platformpth,$(exampleTilemapBuildDir)/assets))
7172
$(call COPY,$(exampleTilemapSrcDir)/assets,$(exampleTilemapBuildDir)/assets,$(RWCARDGLOB))
7273
$(call MKDIR,$(call platformpth,$(exampleTilemapBuildDir)/assets/shaders))
7374
$(call COPY,$(binDir)/engine/render/build/assets/shaders,$(exampleTilemapBuildDir)/assets/shaders,$(RWCARDGLOB))
7475
$(packerApp) $(exampleTilemapBuildDir)/app.pck $(exampleTilemapBuildDir) $(exampleTilemapAssets)
75-
$(RM) "$(exampleTilemapBuildDir)/assets"
7676
$(call PACK_LIBS_SCRIPT,$(vendorDir)/vulkan/lib,$(exampleTilemapBuildDir))
7777

7878
# Package the built application and all its assets to the output directory

tests/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ $(utestIncludeDir):
4949

5050
# Copy the assets directory to the build directory, and pack them
5151
pack-assets:
52+
$(RM) "$(testBuildDir)/assets"
5253
$(call MKDIR,$(call platformpth,$(testBuildDir)/assets))
5354
$(call COPY,$(testSrcDir)/assets,$(testBuildDir)/assets,$(RWCARDGLOB))
5455
$(packerApp) $(testBuildDir)/app.pck $(testBuildDir) $(testAssets)

0 commit comments

Comments
 (0)