diff --git a/src/RawTemplater/Templating/Templater.cpp b/src/RawTemplater/Templating/Templater.cpp
index 26eba7a8..87018553 100644
--- a/src/RawTemplater/Templating/Templater.cpp
+++ b/src/RawTemplater/Templating/Templater.cpp
@@ -288,7 +288,7 @@ namespace templating
             if (m_write_output_to_file)
                 return false;
 
-            m_output_file = fileName;
+            m_output_file = (m_output_directory / fileName).string();
             m_output_stream = std::ofstream(m_output_file);
             if (!m_output_stream.is_open())
             {
diff --git a/tools/scripts/raw.lua b/tools/scripts/raw.lua
index 2444808f..a48ddc97 100644
--- a/tools/scripts/raw.lua
+++ b/tools/scripts/raw.lua
@@ -53,8 +53,13 @@ function Raw:project()
 
 		filter "files:**/*.template"
 			buildmessage 'Templating %{file.relpath}'
+            buildinputs {
+                TargetDirectoryBin .. "/" .. ExecutableByOs('RawTemplater')
+            }
 			buildcommands {
-				"echo \"%{cfg.targetdir}/build/raw/%{file.reldirectory}\""
+				'"' .. TargetDirectoryBin .. '/' .. ExecutableByOs('RawTemplater') .. '"' 
+				.. " -o %{cfg.targetdir}/build/raw/%{file.reldirectory}"
+				.. " %{file.relpath}"
 			}
 			buildoutputs {
 				"%{cfg.targetdir}/build/raw/%{file.relpath}"