diff --git a/makefile b/makefile
index f527348ea56..b71fc5f96cb 100644
--- a/makefile
+++ b/makefile
@@ -1511,9 +1511,12 @@ cppcheck:
 # BGFX shaders
 #-------------------------------------------------
 
-.PHONY: shaders
+.PHONY: shaders bgfx-tools
 
-shaders:
+bgfx-tools:
+	$(SILENT) $(MAKE) $(MAKEPARAMS) -C 3rdparty/bgfx -f makefile dist-$(GENIEOS)
+
+shaders: bgfx-tools
 	$(SILENT) $(MAKE) -C $(SRC)/osd/modules/render/bgfx rebuild
 	
 #-------------------------------------------------
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index c4d93c73348..9925c36658d 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -777,6 +777,7 @@ end
 		MAME_DIR .. "3rdparty/bgfx/src/renderer_null.cpp",
 		MAME_DIR .. "3rdparty/bgfx/src/renderer_vk.cpp",
 		MAME_DIR .. "3rdparty/bgfx/src/renderdoc.cpp",
+		MAME_DIR .. "3rdparty/bgfx/src/shader.cpp",
 		MAME_DIR .. "3rdparty/bgfx/src/shader_dxbc.cpp",
 		MAME_DIR .. "3rdparty/bgfx/src/shader_dx9bc.cpp",
 		MAME_DIR .. "3rdparty/bgfx/src/shader_spirv.cpp",