Updated asset copying across modules

Author: Raelr

examples/game/Makefile

@@ -70,9 +70,9 @@ $(exampleGameBinDir)/%.o: $(exampleGameSrcDir)/%.cpp
 # Copy assets directory to the build directory and pack them
 pack-assets:
 	$(MKDIR) $(call platformpth, $(exampleGameBuildDir)/assets)
-	$(call COPY,$(exampleGameSrcDir)/assets,$(exampleGameBuildDir)/assets,**)
+	$(call COPY,$(exampleGameSrcDir)/assets,$(exampleGameBuildDir)/assets,"$(WCARD)")
 	$(MKDIR) $(call platformpth,$(exampleGameBuildDir)/assets/shaders)
-	$(call COPY,$(binDir)/engine/render/build/assets/shaders,$(exampleGameBuildDir)/assets/shaders,**)
+	$(call COPY,$(binDir)/engine/render/build/assets/shaders,$(exampleGameBuildDir)/assets/shaders,"$(WCARD)")
 	powershell Start-Sleep -Seconds 10.0
 	$(packerApp) $(exampleGameBuildDir)/app.pck $(exampleGameBuildDir) $(exampleGameAssets)
 	$(RM) $(call platformpth,$(exampleGameBuildDir)/assets)

examples/render/Makefile

@@ -69,9 +69,9 @@ $(exampleRenderBinDir)/%.o: $(exampleRenderSrcDir)/%.cpp
 # Copy assets directory to the build directory and pack them
 pack-assets:
 	$(MKDIR) $(call platformpth, $(exampleRenderBuildDir)/assets)
-	$(call COPY,$(exampleRenderSrcDir)/assets,$(exampleRenderBuildDir)/assets,**)
+	$(call COPY,$(exampleRenderSrcDir)/assets,$(exampleRenderBuildDir)/assets,"$(WCARD)")
 	$(MKDIR) $(call platformpth,$(exampleRenderBuildDir)/assets/shaders)
-	$(call COPY,$(binDir)/engine/render/build/assets/shaders,$(exampleRenderBuildDir)/assets/shaders,**)
+	$(call COPY,$(binDir)/engine/render/build/assets/shaders,$(exampleRenderBuildDir)/assets/shaders,"$(WCARD)")
 	powershell Start-Sleep -Seconds 10.0
 	$(packerApp) $(exampleRenderBuildDir)/app.pck $(exampleRenderBuildDir) $(exampleRenderAssets)
 	$(RM) $(call platformpth,$(exampleRenderBuildDir)/assets)

examples/tilemap/Makefile

@@ -68,9 +68,9 @@ $(exampleTilemapBinDir)/%.o: $(exampleTilemapSrcDir)/%.cpp
 # Copy assets directory to the build directory and pack them
 pack-assets:
 	$(MKDIR) $(call platformpth, $(exampleTilemapBuildDir)/assets)
-	$(call COPY,$(exampleTilemapSrcDir)/assets,$(exampleTilemapBuildDir)/assets,**)
+	$(call COPY,$(exampleTilemapSrcDir)/assets,$(exampleTilemapBuildDir)/assets,"$(WCARD)")
 	$(MKDIR) $(call platformpth,$(exampleTilemapBuildDir)/assets/shaders)
-	$(call COPY,$(binDir)/engine/render/build/assets/shaders,$(exampleTilemapBuildDir)/assets/shaders,**)
+	$(call COPY,$(binDir)/engine/render/build/assets/shaders,$(exampleTilemapBuildDir)/assets/shaders,"$(WCARD)")
 	powershell Start-Sleep -Seconds 10.0
 	$(packerApp) $(exampleTilemapBuildDir)/app.pck $(exampleTilemapBuildDir) $(exampleTilemapAssets)
 	$(RM) $(call platformpth,$(exampleTilemapBuildDir)/assets)

make/Platform.mk

@@ -11,12 +11,13 @@ ifeq ($(OS), Windows_NT)
 	platform := windows
 	CXX ?= g++
 	THEN := &&
+	WCARD := *.*
 	PATHSEP := \$(BLANK)
 	MKDIR = powershell -executionpolicy bypass $(scriptsDir)/mkdir.ps1
 	RM = powershell -executionpolicy bypass $(scriptsDir)/rm.ps1
 	EXE_NAME := .exe
 	VOLK_OS := WIN32_KHR
-	COPY = powershell -executionpolicy bypass $(scriptsDir)/copy.ps1 $1 $2 $3
+	COPY = powershell -executionpolicy bypass $(scriptsDir)/copy.ps1 -Source $1 -Destination $2 -Filter $3
 	BASENAME = $(basename $1)
 	VALIDATION_LAYERS_INSTALL_DIR := explicit_layer.d
 	BUILD_FLAGS_SCRIPT = powershell -executionpolicy bypass $(scriptsDir)/buildflags.ps1 --Target $1 --CXXFlags $2 --Dirs $3
@@ -40,6 +41,7 @@ else
 	endif
 
 	# Set UNIX macros
+	WCARD := **
 	THEN := ;
 	PATHSEP := /
 	MKDIR := mkdir -p
@@ -52,4 +54,4 @@ else
 	BUILD_LIB = $(scriptsDir)/combinelibs.sh --src_objs $1 --output_dir $2 --output_name $3
 	COMBINE_LIBS = $(scriptsDir)/combinelibs.sh --src_libs $1 --src_objs $2 --output_dir $3 --output_name $4
 	PACKAGE_SCRIPT = $(scriptsDir)/package.sh $1 $2 $3 $4 $5
-endif
+endif

tests/Makefile

@@ -50,6 +50,5 @@ $(utestIncludeDir):
 # 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)
+	$(call COPY,$(testSrcDir)/data,$(testBuildDir)/data,"$(WCARD)")
+	$(packerApp) $(testBuildDir)/app.pck $(testBuildDir) $(testAssets)