From 82e0f473fbd3e8ac3f78c5c3cf6dbdbfde75a2a4 Mon Sep 17 00:00:00 2001 From: nigel Date: Wed, 8 Jun 2022 21:40:49 +0200 Subject: [PATCH] Shader copying now is a pre-build step --- BarinkEngine/premake5.lua | 46 +++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/BarinkEngine/premake5.lua b/BarinkEngine/premake5.lua index 8f4a6b7..fb65dc6 100644 --- a/BarinkEngine/premake5.lua +++ b/BarinkEngine/premake5.lua @@ -32,14 +32,6 @@ project "BarinkEngine" "../libs/ImGui" } - links { - "phonon", - "lua54", - "spdlog", - "assimp-vc143-mtd", - "glfw3" - } - files { "../libs/ImGui/*.cpp", "../libs/ImGui/backends/imgui_impl_glfw.cpp", @@ -53,17 +45,29 @@ project "BarinkEngine" } + filter { "system:windows"} + prebuildcommands { + -- Copy shaders + "copy graphics\\shaders\\fragment.shader ..\\build\\SandboxApplication\\Debug\\test.fs", + "copy graphics\\shaders\\vertex.shader ..\\build\\SandboxApplication\\Debug\\test.vs", + "copy graphics\\shaders\\RenderSurfaceFrag.shader ..\\build\\SandboxApplication\\Debug\\RenderSurface.fs", + "copy graphics\\shaders\\RenderSurfaceVert.shader ..\\build\\SandboxApplication\\Debug\\RenderSurface.vs" + } + + links { + -- This needs to fall under the filter as the names can differ on different platforms + "phonon", + "lua54", + "spdlog", + "assimp-vc143-mtd", + "glfw3" + } - -- NOTE: make these copy instructions more flexible - ok, err = os.copyfile("graphics/shaders/fragment.shader", "../build/SandboxApplication/Debug/test.fs") - if err then error("Copy fragment shader source failed!") end - - ok, err = os.copyfile("graphics/shaders/vertex.shader", "../build/SandboxApplication/Debug/test.vs") - if err then error("Copy vertex shader source failed!") end - - ok, err = os.copyfile("graphics/shaders/RenderSurfaceFrag.shader", "../build/SandboxApplication/Debug/RenderSurface.fs") - if err then error("Copy fragment shader source failed!") end - - ok, err = os.copyfile("graphics/shaders/RenderSurfaceVert.shader", "../build/SandboxApplication/Debug/RenderSurface.vs") - if err then error("Copy vertex shader source failed!") end - + filter { "system:linux" } + prebuildcommands { + -- Copy shaders + "cp graphics/shaders/fragment.shader ../build/SandboxApplication/Debug/test.fs", + "cp graphics/shaders/vertex.shader ../build/SandboxApplication/Debug/test.vs", + "cp graphics/shaders/RenderSurfaceFrag.shader ../build/SandboxApplication/Debug/RenderSurface.fs", + "cp graphics/shaders/RenderSurfaceVert.shader ../build/SandboxApplication/Debug/RenderSurface.vs" + }