diff --git a/src/RawTemplater.lua b/src/RawTemplater.lua index c553d4c5..1be61623 100644 --- a/src/RawTemplater.lua +++ b/src/RawTemplater.lua @@ -27,7 +27,7 @@ function RawTemplater:project() local links = Links:create() project(self:name()) - targetdir(TargetDirectoryBin) + targetdir(TargetDirectoryBuildTools) location "%{wks.location}/src/%{prj.name}" kind "ConsoleApp" language "C++" diff --git a/src/ZoneCode.lua b/src/ZoneCode.lua index f64cbeee..df12b90c 100644 --- a/src/ZoneCode.lua +++ b/src/ZoneCode.lua @@ -297,7 +297,7 @@ function ZoneCode:project() filter "files:**.gen" buildmessage "Generating ZoneCode for game %{file.basename}" buildcommands { - '"' .. TargetDirectoryBin .. '/' .. ExecutableByOs('ZoneCodeGenerator') .. '"' + '"' .. TargetDirectoryBuildTools .. '/' .. ExecutableByOs('ZoneCodeGenerator') .. '"' .. ' -h "' .. path.join(path.getabsolute(ProjectFolder()), 'ZoneCode/Game/%{file.basename}/%{file.basename}.h') .. '"' .. ' -c "' .. path.join(path.getabsolute(ProjectFolder()), 'ZoneCode/Game/%{file.basename}/%{file.basename}_Commands.txt') .. '"' .. ' -o "%{wks.location}/src/ZoneCode/Game/%{file.basename}/XAssets"' @@ -309,7 +309,7 @@ function ZoneCode:project() path.join(ProjectFolder(), "ZoneCode/Game/%{file.basename}/%{file.basename}.h"), path.join(ProjectFolder(), "ZoneCode/Game/%{file.basename}/%{file.basename}_Commands.txt"), path.join(ProjectFolder(), "Common/Game/%{file.basename}/%{file.basename}_Assets.h"), - TargetDirectoryBin .. "/" .. ExecutableByOs('ZoneCodeGenerator') + TargetDirectoryBuildTools .. "/" .. ExecutableByOs('ZoneCodeGenerator') } filter {} diff --git a/src/ZoneCodeGenerator.lua b/src/ZoneCodeGenerator.lua index 036ef45b..7d17a5d8 100644 --- a/src/ZoneCodeGenerator.lua +++ b/src/ZoneCodeGenerator.lua @@ -27,7 +27,7 @@ function ZoneCodeGenerator:project() local links = Links:create() project(self:name()) - targetdir(TargetDirectoryBin) + targetdir(TargetDirectoryBuildTools) location "%{wks.location}/src/%{prj.name}" kind "ConsoleApp" language "C++" diff --git a/tools/scripts/folders.lua b/tools/scripts/folders.lua index 8e9d12fe..a7a9b734 100644 --- a/tools/scripts/folders.lua +++ b/tools/scripts/folders.lua @@ -26,5 +26,6 @@ end -- Target Directories TargetDirectoryBin = "%{wks.location}/bin/%{cfg.buildcfg}_%{cfg.platform}" +TargetDirectoryBuildTools = "%{wks.location}/buildtools/%{cfg.buildcfg}_%{cfg.platform}" TargetDirectoryLib = "%{wks.location}/lib/%{cfg.buildcfg}_%{cfg.platform}" TargetDirectoryTest = "%{wks.location}/lib/%{cfg.buildcfg}_%{cfg.platform}/tests" \ No newline at end of file diff --git a/tools/scripts/raw.lua b/tools/scripts/raw.lua index 02e693a8..278cc86c 100644 --- a/tools/scripts/raw.lua +++ b/tools/scripts/raw.lua @@ -56,10 +56,10 @@ function Raw:project() filter "files:**/*.template" buildmessage 'Templating %{file.relpath}' buildinputs { - TargetDirectoryBin .. "/" .. ExecutableByOs('RawTemplater') + TargetDirectoryBuildTools .. "/" .. ExecutableByOs('RawTemplater') } buildcommands { - '"' .. TargetDirectoryBin .. '/' .. ExecutableByOs('RawTemplater') .. '"' + '"' .. TargetDirectoryBuildTools .. '/' .. ExecutableByOs('RawTemplater') .. '"' .. " -o %{cfg.targetdir}/build/raw/%{file.reldirectory}" .. " --build-log \"%{prj.location}/build/%{file.relpath}.log\"" .. " %{file.relpath}"