Fixed gameapp target render shader copy overwriting

Author: jonjondev

examples/game/Makefile

@@ -70,18 +70,16 @@ $(exampleGameBinDir)/%.o: $(exampleGameSrcDir)/%.cpp
 # Copy assets directory to the build directory
 game-assets:
 	$(MKDIR) $(call platformpth, $(exampleGameBuildDir)/assets)
-	$(call COPY,$(exampleGameSrcDir)/assets,$(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))
-	$(call COPY,$(binDir)/engine/render/build,$(exampleGameBuildDir),*)
-	$(MKDIR) $(call platformpth,$(exampleGameBuildDir)/assets)
-	$(call COPY,$(exampleGameSrcDir)/assets,$(exampleGameBuildDir)/assets,*)
+	$(MKDIR) $(call platformpth,$(exampleGameBuildDir)/assets/shaders)
+	$(call COPY,$(binDir)/engine/render/build/assets/shaders,$(exampleGameBuildDir)/assets/shaders,**)
 	$(packerApp) $(exampleGameBuildDir)/app.pck $(exampleGameBuildDir) $(exampleGameAssets)
 	$(RM) $(call platformpth,$(exampleGameBuildDir)/assets)
 
 # Package the built application and all its assets to the output directory
 package: all
 	$(RM) "$(outputDir)/$(exampleGameOutputName)"
-	$(call PACKAGE_SCRIPT, $(exampleGameOutputName), $(call BASENAME, $(exampleGameApp)), $(outputDir), $(exampleGameBuildDir), $(packagingFlags))
+	$(call PACKAGE_SCRIPT, $(exampleGameOutputName), $(call BASENAME, $(exampleGameApp)), $(outputDir), $(exampleGameBuildDir), $(packagingFlags))

examples/render/Makefile

@@ -68,10 +68,10 @@ $(exampleRenderBinDir)/%.o: $(exampleRenderSrcDir)/%.cpp
 
 # Copy assets (and other required build files) directory to the build directory
 render-assets:
-	$(MKDIR) $(call platformpth,$(exampleRenderBuildDir))
-	$(call COPY,$(binDir)/engine/render/build,$(exampleRenderBuildDir),**)
-	$(MKDIR) $(call platformpth,$(exampleRenderBuildDir)/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,**)
 	$(packerApp) $(exampleRenderBuildDir)/app.pck $(exampleRenderBuildDir) $(exampleRenderAssets)
 	$(RM) $(call platformpth,$(exampleRenderBuildDir)/assets)
 

examples/tilemap/Makefile

@@ -72,10 +72,8 @@ tilemap-assets:
 
 # Copy assets (and other required build files) directory to the build directory
 render-assets:
-	$(MKDIR) $(call platformpth,$(exampleTilemapBuildDir))
-	$(call COPY,$(binDir)/engine/render/build,$(exampleTilemapBuildDir),**)
-	$(MKDIR) $(call platformpth,$(exampleTilemapBuildDir)/assets)
-	$(call COPY,$(exampleTilemapSrcDir)/assets,$(exampleTilemapBuildDir)/assets,**)
+	$(MKDIR) $(call platformpth,$(exampleTilemapBuildDir)/assets/shaders)
+	$(call COPY,$(binDir)/engine/render/build/assets/shaders,$(exampleTilemapBuildDir)/assets/shaders,**)
 	$(packerApp) $(exampleTilemapBuildDir)/app.pck $(exampleTilemapBuildDir) $(exampleTilemapAssets)
 	$(RM) $(call platformpth,$(exampleTilemapBuildDir)/assets)