Fixed mkdir errors for Windows and changed how libs were being copied

jonjondev · jonjondev · commit bc9cee5febed · 2025-01-12T17:54:28.000+10:00
diff --git a/Makefile b/Makefile
@@ -116,10 +116,10 @@ buildFlags:
 
 # Run cleanup across project
 clean:
-	$(RM) $(call platformpth, $(libDir))
-	$(RM) $(call platformpth, $(binDir))
-	$(RM) $(call platformpth, $(outputDir))
-	$(RM) $(call platformpth, $(buildFlagsFile))
+	$(RM) $(call platformpth,$(libDir))
+	$(RM) $(call platformpth,$(binDir))
+	$(RM) $(call platformpth,$(outputDir))
+	$(RM) $(call platformpth,$(buildFlagsFile))
 
 # Check file formatting program across all source files
 format-check:
diff --git a/engine/core/Makefile b/engine/core/Makefile
@@ -24,13 +24,13 @@ endif
 
 # Build the static library
 $(coreLib): $(coreObjects)
-	$(MKDIR) $(call platformpth, $(libDir))
+	$(call MKDIR,$(call platformpth,$(libDir)))
 	ar -crs $(coreLib) $(coreObjects)
 
 # Add all rules from dependency files
 -include $(coreDepends)
 
 # Compile object files to the bin directory
 $(coreBinDir)/%.o: $(coreSrcDir)/%.cpp
-	$(MKDIR) $(call platformpth, $(@D))
+	$(call MKDIR,$(call platformpth,$(@D)))
 	$(CXX) -MMD -MP -c $(compileFlags) -I $(engineDir) $< -o $@ $(CXXFLAGS)
diff --git a/engine/render/Makefile b/engine/render/Makefile
@@ -34,18 +34,18 @@ all: $(renderLib) $(vertObjects) $(fragObjects)
 
 # Build the static library
 $(renderLib): $(renderObjects)
-	-$(RM) $(call platformpth, $(renderLib))
+	-$(RM) $(call platformpth,$(renderLib))
 	$(call COMBINE_LIBS, $(renderLibs), $(renderObjects), $(libDir), render)
 
 # Add all rules from dependency files
 -include $(renderDepends)
 
 # Compile object files to the bin directory
 $(renderBinDir)/%.o: $(renderSrcDir)/%.cpp
-	$(MKDIR) $(call platformpth, $(@D))
+	$(call MKDIR, $(call platformpth,$(@D)))
 	$(CXX) -MMD -MP -c $(compileFlags) -I $(engineDir) $< -o $@ $(CXXFLAGS) -DVK_USE_PLATFORM_$(VOLK_OS)
 
 # Compile shaders to the build directory
 $(renderBuildDir)/assets/shaders/%.spv: $(renderSrcDir)/assets/shaders/%
-	$(MKDIR) $(call platformpth, $(@D))
+	$(call MKDIR, $(call platformpth,$(@D)))
 	$(call platformpth,$(vendorDir)/glslang/build/StandAlone/glslangValidator$(EXE_NAME)) $< -V -o $@
diff --git a/engine/resources/Makefile b/engine/resources/Makefile
@@ -19,13 +19,13 @@ linkFlags += -l utils
 
 # Build the static library
 $(resourcesLib): $(resourcesObjects)
-	$(MKDIR) $(call platformpth, $(libDir))
+	$(call MKDIR,$(call platformpth,$(libDir)))
 	ar -crs $(resourcesLib) $(resourcesObjects)
 
 # Add all rules from dependency files
 -include $(resourcesDepends)
 
 # Compile object files to the bin directory
 $(resourcesBinDir)/%.o: $(resourcesSrcDir)/%.cpp
-	$(MKDIR) $(call platformpth, $(@D))
+	$(call MKDIR,$(call platformpth,$(@D)))
 	$(CXX) -MMD -MP -c $(compileFlags) -I $(engineDir) $< -o $@ $(CXXFLAGS)
diff --git a/engine/utils/Makefile b/engine/utils/Makefile
@@ -17,13 +17,13 @@ utilsDepends := $(patsubst %.o, %.d, $(call rwildcard,$(utilsBinDir)/,*.o))
 
 # Build the static library
 $(utilsLib): $(utilsObjects)
-	$(MKDIR) $(call platformpth, $(libDir))
+	$(call MKDIR,$(call platformpth,$(libDir)))
 	ar -crs $(utilsLib) $(utilsObjects)
 
 # Add all rules from dependency files
 -include $(utilsDepends)
 
 # Compile object files to the bin directory
 $(utilsBinDir)/%.o: $(utilsSrcDir)/%.cpp
-	$(MKDIR) $(call platformpth, $(@D))
+	$(call MKDIR,$(call platformpth,$(@D)))
 	$(CXX) -MMD -MP -c $(compileFlags) $< -o $@ $(CXXFLAGS)
diff --git a/engine/window/Makefile b/engine/window/Makefile
@@ -21,13 +21,13 @@ compileFlags += -I $(vendorDir)/glfw/include
 
 # Build the static library
 $(windowLib): $(windowObjects)
-	-$(RM) $(call platformpth, $(windowLib))
+	-$(RM) $(call platformpth,$(windowLib))
 	$(call COMBINE_LIBS, $(windowLibs), $(windowObjects), $(libDir), window)
 
 # Add all rules from dependency files
 -include $(windowDepends)
 
 # Compile object files to the bin directory
 $(windowBinDir)/%.o: $(windowSrcDir)/%.cpp
-	$(MKDIR) $(call platformpth, $(@D))
+	$(call MKDIR,$(call platformpth,$(@D)))
 	$(CXX) -MMD -MP -c $(compileFlags) -I $(engineDir) $< -o $@ $(CXXFLAGS)
diff --git a/examples/game/Makefile b/examples/game/Makefile
@@ -50,37 +50,37 @@ 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 vulkan-libs pack-assets
+.PHONY: all pack-assets
 
-all: $(exampleGameApp) vulkan-libs pack-assets
+all: $(exampleGameApp) pack-assets
 
 # Link the object files and create an executable
 $(exampleGameApp): $(utilsLib) $(windowLib) $(renderLib) $(coreLib) $(exampleGameObjects)
-	$(MKDIR) $(call platformpth, $(@D))
+	$(call MKDIR,$(call platformpth,$(@D)))
 	$(CXX) $(exampleGameObjects) -o $(exampleGameApp) $(linkFlags)
 
 # Add all rules from dependency files
 -include $(exampleGameDepends)
 
 # Compile object files to the bin directory
 $(exampleGameBinDir)/%.o: $(exampleGameSrcDir)/%.cpp
-	$(MKDIR) $(call platformpth, $(@D))
+	$(call MKDIR,$(call platformpth,$(@D)))
 	$(CXX) -MMD -MP -c $(compileFlags) -I $(engineDir) $< -o $@ $(CXXFLAGS)
 
 # Copy assets directory to the build directory and pack them
 pack-assets:
-	$(MKDIR) $(call platformpth, $(exampleGameBuildDir)/assets)
+	$(call MKDIR,$(call platformpth,$(exampleGameBuildDir)/assets))
 	$(call COPY,$(exampleGameSrcDir)/assets,$(exampleGameBuildDir)/assets,$(RWCARDGLOB))
-	$(MKDIR) $(call platformpth,$(exampleGameBuildDir)/assets/shaders)
+	$(call MKDIR,$(call platformpth,$(exampleGameBuildDir)/assets/shaders))
 	$(call COPY,$(binDir)/engine/render/build/assets/shaders,$(exampleGameBuildDir)/assets/shaders,$(RWCARDGLOB))
 	$(packerApp) $(exampleGameBuildDir)/app.pck $(exampleGameBuildDir) $(exampleGameAssets)
+	$(RM) "$(exampleGameBuildDir)/assets"
+	$(call PACK_LIBS_SCRIPT,$(vendorDir)/vulkan/lib,$(exampleGameBuildDir))
+
 
 # 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))
 
-# Copy Vulkan libraries to the build directory
-vulkan-libs:
-	$(call COPY_VULKAN,$(vendorDir),$(exampleGameBuildDir))
 
diff --git a/examples/render/Makefile b/examples/render/Makefile
@@ -49,36 +49,34 @@ 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 vulkan-libs pack-assets
+.PHONY: all pack-assets
 
-all: $(exampleRenderApp) vulkan-libs pack-assets
+all: $(exampleRenderApp) pack-assets
 
 # Link the object files and create an executable
 $(exampleRenderApp): $(renderLib) $(exampleRenderObjects)
-	$(MKDIR) $(call platformpth, $(@D))
+	$(call MKDIR,$(call platformpth,$(@D)))
 	$(CXX) $(exampleRenderObjects) -o $(exampleRenderApp) $(linkFlags)
 
 # Add all rules from dependency files
 -include $(exampleRenderDepends)
 
 # Compile object files to the bin directory
 $(exampleRenderBinDir)/%.o: $(exampleRenderSrcDir)/%.cpp
-	$(MKDIR) $(call platformpth, $(@D))
+	$(call MKDIR,$(call platformpth,$(@D)))
 	$(CXX) -MMD -MP -c $(compileFlags) -I $(engineDir) $< -o $@ $(CXXFLAGS)
 
 # Copy assets directory to the build directory and pack them
 pack-assets:
-	$(MKDIR) $(call platformpth, $(exampleRenderBuildDir)/assets)
+	$(call MKDIR,$(call platformpth,$(exampleRenderBuildDir)/assets))
 	$(call COPY,$(exampleRenderSrcDir)/assets,$(exampleRenderBuildDir)/assets,$(RWCARDGLOB))
-	$(MKDIR) $(call platformpth,$(exampleRenderBuildDir)/assets/shaders)
+	$(call MKDIR,$(call platformpth,$(exampleRenderBuildDir)/assets/shaders))
 	$(call COPY,$(binDir)/engine/render/build/assets/shaders,$(exampleRenderBuildDir)/assets/shaders,$(RWCARDGLOB))
 	$(packerApp) $(exampleRenderBuildDir)/app.pck $(exampleRenderBuildDir) $(exampleRenderAssets)
+	$(RM) "$(exampleRenderBuildDir)/assets"
+	$(call PACK_LIBS_SCRIPT,$(vendorDir)/vulkan/lib,$(exampleRenderBuildDir))
 
 # Package the built application and all its assets to the output directory
 package:
 	$(RM) "$(outputDir)/$(exampleRenderOutputName)"
 	$(call PACKAGE_SCRIPT, $(exampleRenderOutputName), $(call BASENAME, $(exampleRenderApp)), $(outputDir), $(exampleRenderBuildDir), $(packagingFlags))
-
-# Copy Vulkan libraries to the build directory
-vulkan-libs:
-	$(call COPY_VULKAN,$(vendorDir),$(exampleRenderBuildDir))
diff --git a/examples/tilemap/Makefile b/examples/tilemap/Makefile
@@ -48,36 +48,34 @@ 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 vulkan-libs pack-assets
+.PHONY: all pack-assets
 
-all: $(exampleTilemapApp) vulkan-libs pack-assets
+all: $(exampleTilemapApp) pack-assets
 
 # Link the object files and create an executable
 $(exampleTilemapApp): $(renderLib) $(exampleTilemapObjects)
-	$(MKDIR) $(call platformpth, $(@D))
+	$(call MKDIR,$(call platformpth,$(@D)))
 	$(CXX) $(exampleTilemapObjects) -o $(exampleTilemapApp) $(linkFlags)
 
 # Add all rules from dependency files
 -include $(exampleTilemapDepends)
 
 # Compile object files to the bin directory
 $(exampleTilemapBinDir)/%.o: $(exampleTilemapSrcDir)/%.cpp
-	$(MKDIR) $(call platformpth, $(@D))
+	$(call MKDIR,$(call platformpth,$(@D)))
 	$(CXX) -MMD -MP -c $(compileFlags) -I $(engineDir) $< -o $@ $(CXXFLAGS)
 
 # Copy assets directory to the build directory and pack them
 pack-assets:
-	$(MKDIR) $(call platformpth, $(exampleTilemapBuildDir)/assets)
+	$(call MKDIR,$(call platformpth,$(exampleTilemapBuildDir)/assets))
 	$(call COPY,$(exampleTilemapSrcDir)/assets,$(exampleTilemapBuildDir)/assets,$(RWCARDGLOB))
-	$(MKDIR) $(call platformpth,$(exampleTilemapBuildDir)/assets/shaders)
+	$(call MKDIR,$(call platformpth,$(exampleTilemapBuildDir)/assets/shaders))
 	$(call COPY,$(binDir)/engine/render/build/assets/shaders,$(exampleTilemapBuildDir)/assets/shaders,$(RWCARDGLOB))
 	$(packerApp) $(exampleTilemapBuildDir)/app.pck $(exampleTilemapBuildDir) $(exampleTilemapAssets)
+	$(RM) "$(exampleTilemapBuildDir)/assets"
+	$(call PACK_LIBS_SCRIPT,$(vendorDir)/vulkan/lib,$(exampleTilemapBuildDir))
 
 # Package the built application and all its assets to the output directory
 package:
 	$(RM) "$(outputDir)/$(exampleTilemapOutputName)"
-	$(call PACKAGE_SCRIPT, $(exampleTilemapOutputName), $(call BASENAME, $(exampleTilemapApp)), $(outputDir), $(exampleTilemapBuildDir), $(packagingFlags))
-
-# Copy Vulkan libraries to the build directory
-vulkan-libs:
-	$(call COPY_VULKAN,$(vendorDir),$(exampleTilemapBuildDir))
+	$(call PACKAGE_SCRIPT, $(exampleTilemapOutputName), $(call BASENAME, $(exampleTilemapApp)), $(outputDir), $(exampleTilemapBuildDir), $(packagingFlags))
diff --git a/make/Platform.mk b/make/Platform.mk
@@ -13,18 +13,18 @@ ifeq ($(OS), Windows_NT)
 	THEN := &&
 	RWCARDGLOB := "*.*"
 	PATHSEP := \$(BLANK)
-	MKDIR = powershell -executionpolicy bypass $(scriptsDir)/mkdir.ps1
+	MKDIR = powershell -executionpolicy bypass $(scriptsDir)/mkdir.ps1 -Path $1
 	RM = powershell -executionpolicy bypass $(scriptsDir)/rm.ps1
 	EXE_NAME := .exe
 	VOLK_OS := WIN32_KHR
 	COPY = powershell -executionpolicy bypass $(scriptsDir)/copy.ps1 -Source $1 -Destination $2 -Filter $3
-	COPY_VULKAN = $(call COPY,$1/vulkan/lib,$2/lib,$(RWCARDGLOB)); $(call COPY,$2/lib, $2,"vulkan-1.dll"); $(RM) $2\lib\vulkan-1.dll
 	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
 	BUILD_LIB = powershell -executionpolicy bypass $(scriptsDir)/combinelibs.ps1 --src_objs $1 --output_dir $2 --output_name $3
 	COMBINE_LIBS = powershell -executionpolicy bypass $(scriptsDir)/combinelibs.ps1 --src_libs $1 --src_objs $2 --output_dir $3 --output_name $4
-	PACKAGE_SCRIPT = powershell -executionpolicy bypass $(scriptsDir)/package.ps1 --pkg-name '$1' --exe-name $2 --output-dir $3 --build-dir $4 $5
+	PACKAGE_SCRIPT = powershell -executionpolicy bypass $(scriptsDir)/package.ps1 --pkg-name "$1" --exe-name $2 --output-dir $3 --build-dir $4 $5
+	PACK_LIBS_SCRIPT = powershell -executionpolicy bypass $(scriptsDir)/packagelibs.ps1 '$1' '$2'
 else
 	# Check for MacOS/Linux
 	UNAMEOS := $(shell uname)
@@ -48,12 +48,12 @@ else
 	MKDIR = mkdir -p $1
 	RM := rm -rf
 	COPY = cp -r $1$(PATHSEP)$3 $2
-	COPY_VULKAN = $(call COPY,$1/vulkan/lib,$2/lib,$(RWCARDGLOB))
 	BASENAME = $(shell basename $1)
 	COPY_DIR = $(call COPY,$1,$2,$3)
 	VALIDATION_LAYERS_INSTALL_DIR := lib/explicit_layer.d
 	BUILD_FLAGS_SCRIPT = $(scriptsDir)/buildflags.sh $1 "$2" "$3"
 	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
+	PACK_LIBS_SCRIPT = cp -r "$1" "$2"
 endif
diff --git a/packer/Makefile b/packer/Makefile
@@ -26,13 +26,13 @@ all: $(packerApp)
 
 # Link the object files and create an executable
 $(packerApp): $(packerObjects)
-	$(MKDIR) $(call platformpth, $(@D))
+	$(call MKDIR,$(call platformpth,$(@D)))
 	$(CXX) $(packerObjects) -o $(packerApp) $(linkFlags)
 
 # Add all rules from dependency files
 -include $(packerDepends)
 
 # Compile object files to the bin directory
 $(packerBinDir)/%.o: $(packerSrcDir)/%.cpp
-	$(MKDIR) $(call platformpth, $(@D))
+	$(call MKDIR,$(call platformpth,$(@D)))
 	$(CXX) -MMD -MP -c $(compileFlags) -I $(engineDir) $< -o $@ $(CXXFLAGS)
diff --git a/scripts/mkdir.ps1 b/scripts/mkdir.ps1
@@ -8,4 +8,4 @@
 
 param ([String] $Path)
 
-if (!(Test-Path $Path)) { New-Item -Path $Path -ItemType directory }
+if (-not(Test-Path $Path)) { New-Item -Path $Path -ItemType "directory" -Force }
diff --git a/scripts/package.ps1 b/scripts/package.ps1
@@ -17,36 +17,38 @@
 
 foreach ($arg in $args)
 {
+
     [string] $val = $arg
     if ($val.Contains("--")) {
-        if ($current_arg -ne $val) { $current_arg = $val }
+        if ($current_arg -ne $val)
+        {
+            $current_arg = $val
+        }
         continue
     }
 
-    if ($current_arg -eq "--pkg-name") { $PkgName = $val }
-    if ($current_arg -eq "--exe-name") { $ExeName = $val }
-    if ($current_arg -eq "--output-dir") { $OutputDir = $val }
-    if ($current_arg -eq "--build-dir") { $BuildDir = $val }
+    if ($current_arg -eq "--pkg-name") { $PkgName += $val.trim("\n") + " "}
+    if ($current_arg -eq "--exe-name") { $ExeName += $val }
+    if ($current_arg -eq "--output-dir") { $OutputDir += $val }
+    if ($current_arg -eq "--build-dir") { $BuildDir += $val }
     if ($current_arg -eq "--env-vars") { $EnvVars += $val }
     if ($current_arg -eq "--excludes") { $Excludes += $val }
 }
 
+$PkgName = $PkgName.TrimEnd()
 [string] $PkgFile = "$OutputDir/$PkgName"
 
 Write-Output "PACKAGING: $args"
 
 if (Test-Path $OutputDir/$PkgName) { Remove-Item -Path $OutputDir/$PkgName -Recurse }
 
-New-Item -Path $PkgFile -ItemType directory -Force
+New-Item -Path "$PkgFile" -ItemType directory -Force
 
 if (Test-Path -Path $BuildDir/lib)
 {
     Get-ChildItem -Directory $BuildDir/lib | Copy-Item -Filter * -Destination $PkgFile -Recurse -Force
 }
 
-New-Item -Path $BuildDir/assets -ItemType directory -Force
-
-Copy-Item -Path $BuildDir/assets -Filter * -Destination $PkgFile/assets -Recurse -Force
 Get-ChildItem $BuildDir | Copy-Item -Filter **.exe -Destination $PkgFile -Recurse -Force
 
 [string] $val
@@ -56,9 +58,7 @@ if ($Excludes.Count -gt 0)
     foreach ($i in $Excludes) { if ($1 -ne $OutputDir) { Remove-Item -Path $PkgFile/$i -Recurse  -Force -ErrorAction SilentlyContinue } }
 }
 
-if (-not (Test-Path -Path "$PkgFile/lib/*"))
+if ((Test-Path -Path "$PkgFile/lib") -and (-not (Test-Path -Path "$PkgFile/lib/*")))
 {
     Remove-Item -Path $PkgFile/lib -Force
-}
-
-Remove-Item -Path "$PkgFile/assets" -Force -Recurse
+}
diff --git a/scripts/packagelibs.ps1 b/scripts/packagelibs.ps1
@@ -0,0 +1,21 @@
+#
+# Copyright (c) 2020-present Caps Collective & contributors
+# Originally authored by Jonathan Moallem (@jonjondev) & Aryeh Zinn (@Raelr)
+#
+# This code is released under an unmodified zlib license.
+# For conditions of distribution and use, please see:
+#     https://opensource.org/licenses/Zlib
+
+param( [String] $LibSourceDir, [String] $LibDestDir )
+
+robocopy $LibSourceDir $LibDestDir /e /im /is /it
+
+if (Test-Path -Path "$LibDestDir/lib/*.dll")
+{
+    robocopy $LibDestDir/lib LibDestDir *.dll /mov /im /is /it
+}
+
+if (Test-Path -Path "$LibDestDir/lib/*")
+{
+    Remove-Item -Path "$LibDestDir/lib" -Force
+}
diff --git a/tests/Makefile b/tests/Makefile
