Fixed globbing pattern issues across platforms

Author: jonjondev

engine/render/Makefile

@@ -53,4 +53,4 @@ $(renderBuildDir)/assets/shaders/%.spv: $(renderSrcDir)/assets/shaders/%
 # Copy Vulkan libraries to the build directory
 vulkan-libs:
 	$(MKDIR) $(call platformpth, $(renderBuildDir)/lib)
-	$(call COPY,$(vendorDir)/vulkan/lib,$(renderBuildDir)/lib,"$(RWCARDGLOB)")
+	$(call COPY,$(vendorDir)/vulkan/lib,$(renderBuildDir)/lib,$(RWCARDGLOB))

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,"$(RWCARDGLOB)")
+	$(call COPY,$(exampleGameSrcDir)/assets,$(exampleGameBuildDir)/assets,$(RWCARDGLOB))
 	$(MKDIR) $(call platformpth,$(exampleGameBuildDir)/assets/shaders)
-	$(call COPY,$(binDir)/engine/render/build/assets/shaders,$(exampleGameBuildDir)/assets/shaders,"$(RWCARDGLOB)")
+	$(call COPY,$(binDir)/engine/render/build/assets/shaders,$(exampleGameBuildDir)/assets/shaders,$(RWCARDGLOB))
 	$(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,"$(RWCARDGLOB)")
+	$(call COPY,$(exampleRenderSrcDir)/assets,$(exampleRenderBuildDir)/assets,$(RWCARDGLOB))
 	$(MKDIR) $(call platformpth,$(exampleRenderBuildDir)/assets/shaders)
-	$(call COPY,$(binDir)/engine/render/build/assets/shaders,$(exampleRenderBuildDir)/assets/shaders,"$(RWCARDGLOB)")
+	$(call COPY,$(binDir)/engine/render/build/assets/shaders,$(exampleRenderBuildDir)/assets/shaders,$(RWCARDGLOB))
 	$(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,"$(RWCARDGLOB)")
+	$(call COPY,$(exampleTilemapSrcDir)/assets,$(exampleTilemapBuildDir)/assets,$(RWCARDGLOB))
 	$(MKDIR) $(call platformpth,$(exampleTilemapBuildDir)/assets/shaders)
-	$(call COPY,$(binDir)/engine/render/build/assets/shaders,$(exampleTilemapBuildDir)/assets/shaders,"$(RWCARDGLOB)")
+	$(call COPY,$(binDir)/engine/render/build/assets/shaders,$(exampleTilemapBuildDir)/assets/shaders,$(RWCARDGLOB))
 	$(packerApp) $(exampleTilemapBuildDir)/app.pck $(exampleTilemapBuildDir) $(exampleTilemapAssets)
 	$(RM) $(call platformpth,$(exampleTilemapBuildDir)/assets)
 

make/Platform.mk

@@ -11,7 +11,7 @@ ifeq ($(OS), Windows_NT)
 	platform := windows
 	CXX ?= g++
 	THEN := &&
-	RWCARDGLOB := *.*
+	RWCARDGLOB := "*.*"
 	PATHSEP := \$(BLANK)
 	MKDIR = powershell -executionpolicy bypass $(scriptsDir)/mkdir.ps1
 	RM = powershell -executionpolicy bypass $(scriptsDir)/rm.ps1

tests/Makefile

@@ -25,9 +25,9 @@ testAssets += $(patsubst ./%,%, $(call rwildcard,$(testSrcDir),*.scene))
 utestIncludeDir := $(vendorDir)/include/utest
 linkFlags += -l core -l utils -l resources
 
-.PHONY: all test-data
+.PHONY: all pack-assets
 
-all: $(testApp) test-data
+all: $(testApp) pack-assets
 
 # Link the object files and create an executable
 $(testApp): $(utestIncludeDir) $(testObjects)
@@ -47,8 +47,8 @@ $(utestIncludeDir):
 	$(MKDIR) $(call platformpth, $(utestIncludeDir))
 	$(call COPY,$(vendorDir)/utest.h,$(utestIncludeDir),utest.h)
 
-# Copy the data directory to the build directory, and pack them
-test-data:
+# Copy the assets directory to the build directory, and pack them
+pack-assets:
 	$(MKDIR) $(call platformpth,$(testBuildDir)/data)
-	$(call COPY,$(testSrcDir)/data,$(testBuildDir)/data,"$(RWCARDGLOB)")
+	$(call COPY,$(testSrcDir)/data,$(testBuildDir)/data,$(RWCARDGLOB))
 	$(packerApp) $(testBuildDir)/app.pck $(testBuildDir) $(testAssets)