Moved all asset packing steps into single target across modules, added debug delay

Author: jonjondev

examples/game/Makefile

@@ -50,9 +50,9 @@ packagingFlags = $(ENV_VARS) --excludes "$(packagingExcludes)"
 compileFlags += -I $(vendorDir)/glfw/include -I $(vendorDir)/glm -I $(vendorDir)/freetype/include
 linkFlags += -l core -l window -l render -l resources -l utils
 
-.PHONY: all game-assets render-assets
+.PHONY: all pack-assets
 
-all: $(exampleGameApp) game-assets render-assets
+all: $(exampleGameApp) pack-assets
 
 # Link the object files and create an executable
 $(exampleGameApp): $(utilsLib) $(windowLib) $(renderLib) $(coreLib) $(exampleGameObjects)
@@ -67,15 +67,13 @@ $(exampleGameBinDir)/%.o: $(exampleGameSrcDir)/%.cpp
 	$(MKDIR) $(call platformpth, $(@D))
 	$(CXX) -MMD -MP -c $(compileFlags) -I $(engineDir) $< -o $@ $(CXXFLAGS)
 
-# Copy assets directory to the build directory
-game-assets:
+# Copy assets directory to the build directory and pack them
+pack-assets:
 	$(MKDIR) $(call platformpth, $(exampleGameBuildDir)/assets)
 	$(call COPY,$(exampleGameSrcDir)/assets,$(exampleGameBuildDir)/assets,**)
-
-# Copy assets (and other required build files) directory to the build directory
-render-assets:
 	$(MKDIR) $(call platformpth,$(exampleGameBuildDir)/assets/shaders)
 	$(call COPY,$(binDir)/engine/render/build/assets/shaders,$(exampleGameBuildDir)/assets/shaders,**)
+	powershell Start-Sleep -Seconds 10.0
 	$(packerApp) $(exampleGameBuildDir)/app.pck $(exampleGameBuildDir) $(exampleGameAssets)
 	$(RM) $(call platformpth,$(exampleGameBuildDir)/assets)
 

examples/render/Makefile

@@ -49,9 +49,9 @@ packagingFlags = $(ENV_VARS) --excludes "$(packagingExcludes)"
 compileFlags += -I $(vendorDir)/glfw/include -I $(vendorDir)/glm -I $(vendorDir)/freetype/include
 linkFlags += -l render -l window -l resources -l utils
 
-.PHONY: all render-assets
+.PHONY: all pack-assets
 
-all: $(exampleRenderApp) render-assets
+all: $(exampleRenderApp) pack-assets
 
 # Link the object files and create an executable
 $(exampleRenderApp): $(renderLib) $(exampleRenderObjects)
@@ -66,12 +66,13 @@ $(exampleRenderBinDir)/%.o: $(exampleRenderSrcDir)/%.cpp
 	$(MKDIR) $(call platformpth, $(@D))
 	$(CXX) -MMD -MP -c $(compileFlags) -I $(engineDir) $< -o $@ $(CXXFLAGS)
 
-# Copy assets (and other required build files) directory to the build directory
-render-assets:
+# Copy assets directory to the build directory and pack them
+pack-assets:
 	$(MKDIR) $(call platformpth, $(exampleRenderBuildDir)/assets)
 	$(call COPY,$(exampleRenderSrcDir)/assets,$(exampleRenderBuildDir)/assets,**)
 	$(MKDIR) $(call platformpth,$(exampleRenderBuildDir)/assets/shaders)
 	$(call COPY,$(binDir)/engine/render/build/assets/shaders,$(exampleRenderBuildDir)/assets/shaders,**)
+	powershell Start-Sleep -Seconds 10.0
 	$(packerApp) $(exampleRenderBuildDir)/app.pck $(exampleRenderBuildDir) $(exampleRenderAssets)
 	$(RM) $(call platformpth,$(exampleRenderBuildDir)/assets)
 

examples/tilemap/Makefile

@@ -48,9 +48,9 @@ packagingFlags = $(ENV_VARS) --excludes "$(packagingExcludes)"
 compileFlags += -I $(vendorDir)/glfw/include -I $(vendorDir)/glm -I $(vendorDir)/freetype/include
 linkFlags += -l render -l window -l resources -l utils
 
-.PHONY: all render-assets tilemap-assets
+.PHONY: all pack-assets
 
-all: $(exampleTilemapApp) tilemap-assets render-assets
+all: $(exampleTilemapApp) pack-assets
 
 # Link the object files and create an executable
 $(exampleTilemapApp): $(renderLib) $(exampleTilemapObjects)
@@ -65,15 +65,13 @@ $(exampleTilemapBinDir)/%.o: $(exampleTilemapSrcDir)/%.cpp
 	$(MKDIR) $(call platformpth, $(@D))
 	$(CXX) -MMD -MP -c $(compileFlags) -I $(engineDir) $< -o $@ $(CXXFLAGS)
 
-# Copy assets directory to the build directory
-tilemap-assets:
+# Copy assets directory to the build directory and pack them
+pack-assets:
 	$(MKDIR) $(call platformpth, $(exampleTilemapBuildDir)/assets)
 	$(call COPY,$(exampleTilemapSrcDir)/assets,$(exampleTilemapBuildDir)/assets,**)
-
-# Copy assets (and other required build files) directory to the build directory
-render-assets:
 	$(MKDIR) $(call platformpth,$(exampleTilemapBuildDir)/assets/shaders)
 	$(call COPY,$(binDir)/engine/render/build/assets/shaders,$(exampleTilemapBuildDir)/assets/shaders,**)
+	powershell Start-Sleep -Seconds 10.0
 	$(packerApp) $(exampleTilemapBuildDir)/app.pck $(exampleTilemapBuildDir) $(exampleTilemapAssets)
 	$(RM) $(call platformpth,$(exampleTilemapBuildDir)/assets)
 

tests/Makefile

@@ -47,8 +47,9 @@ $(utestIncludeDir):
 	$(MKDIR) $(call platformpth, $(utestIncludeDir))
 	$(call COPY,$(vendorDir)/utest.h,$(utestIncludeDir),utest.h)
 
-# Copy the data directory to the build directory
+# Copy the data directory to the build directory, and pack them
 test-data:
 	$(MKDIR) $(call platformpth,$(testBuildDir)/data)
 	$(call COPY,$(testSrcDir)/data,$(testBuildDir)/data,**)
+	powershell Start-Sleep -Seconds 10.0
 	$(packerApp) $(testBuildDir)/app.pck $(testBuildDir) $(testAssets)