zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-20 16:15:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4 from Laupetin/feature/buildtools-path

Browse Source 
Move ZoneCodeGenerator and RawTemplater to buildtools output folder
This commit is contained in:
Jan 2023-06-19 19:12:18 +02:00 committed by GitHub
commit 3c2774614f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/RawTemplater.lua
View File

@ -27,7 +27,7 @@ function RawTemplater:project()
local links = Links:create() local links = Links:create()
project(self:name()) project(self:name())
targetdir(TargetDirectoryBin) targetdir(TargetDirectoryBuildTools)
location "%{wks.location}/src/%{prj.name}" location "%{wks.location}/src/%{prj.name}"
kind "ConsoleApp" kind "ConsoleApp"
language "C++" language "C++"

4
src/ZoneCode.lua
View File

@ -297,7 +297,7 @@ function ZoneCode:project()
filter "files:**.gen" filter "files:**.gen"
buildmessage "Generating ZoneCode for game %{file.basename}" buildmessage "Generating ZoneCode for game %{file.basename}"
buildcommands { buildcommands {
'"' .. TargetDirectoryBin .. '/' .. ExecutableByOs('ZoneCodeGenerator') .. '"' '"' .. TargetDirectoryBuildTools .. '/' .. ExecutableByOs('ZoneCodeGenerator') .. '"'
.. ' -h "' .. path.join(path.getabsolute(ProjectFolder()), 'ZoneCode/Game/%{file.basename}/%{file.basename}.h') .. '"' .. ' -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') .. '"' .. ' -c "' .. path.join(path.getabsolute(ProjectFolder()), 'ZoneCode/Game/%{file.basename}/%{file.basename}_Commands.txt') .. '"'
.. ' -o "%{wks.location}/src/ZoneCode/Game/%{file.basename}/XAssets"' .. ' -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}.h"),
path.join(ProjectFolder(), "ZoneCode/Game/%{file.basename}/%{file.basename}_Commands.txt"), path.join(ProjectFolder(), "ZoneCode/Game/%{file.basename}/%{file.basename}_Commands.txt"),
path.join(ProjectFolder(), "Common/Game/%{file.basename}/%{file.basename}_Assets.h"), path.join(ProjectFolder(), "Common/Game/%{file.basename}/%{file.basename}_Assets.h"),
TargetDirectoryBin .. "/" .. ExecutableByOs('ZoneCodeGenerator') TargetDirectoryBuildTools .. "/" .. ExecutableByOs('ZoneCodeGenerator')
} }
filter {} filter {}

2
src/ZoneCodeGenerator.lua
View File

@ -27,7 +27,7 @@ function ZoneCodeGenerator:project()
local links = Links:create() local links = Links:create()
project(self:name()) project(self:name())
targetdir(TargetDirectoryBin) targetdir(TargetDirectoryBuildTools)
location "%{wks.location}/src/%{prj.name}" location "%{wks.location}/src/%{prj.name}"
kind "ConsoleApp" kind "ConsoleApp"
language "C++" language "C++"

1
tools/scripts/folders.lua
View File

@ -26,5 +26,6 @@ end
-- Target Directories -- Target Directories
TargetDirectoryBin = "%{wks.location}/bin/%{cfg.buildcfg}_%{cfg.platform}" TargetDirectoryBin = "%{wks.location}/bin/%{cfg.buildcfg}_%{cfg.platform}"
TargetDirectoryBuildTools = "%{wks.location}/buildtools/%{cfg.buildcfg}_%{cfg.platform}"
TargetDirectoryLib = "%{wks.location}/lib/%{cfg.buildcfg}_%{cfg.platform}" TargetDirectoryLib = "%{wks.location}/lib/%{cfg.buildcfg}_%{cfg.platform}"
TargetDirectoryTest = "%{wks.location}/lib/%{cfg.buildcfg}_%{cfg.platform}/tests" TargetDirectoryTest = "%{wks.location}/lib/%{cfg.buildcfg}_%{cfg.platform}/tests"

4
tools/scripts/raw.lua
View File

@ -56,10 +56,10 @@ function Raw:project()
filter "files:**/*.template" filter "files:**/*.template"
buildmessage 'Templating %{file.relpath}' buildmessage 'Templating %{file.relpath}'
buildinputs { buildinputs {
TargetDirectoryBin .. "/" .. ExecutableByOs('RawTemplater') TargetDirectoryBuildTools .. "/" .. ExecutableByOs('RawTemplater')
} }
buildcommands { buildcommands {
'"' .. TargetDirectoryBin .. '/' .. ExecutableByOs('RawTemplater') .. '"' '"' .. TargetDirectoryBuildTools .. '/' .. ExecutableByOs('RawTemplater') .. '"'
.. " -o %{cfg.targetdir}/build/raw/%{file.reldirectory}" .. " -o %{cfg.targetdir}/build/raw/%{file.reldirectory}"
.. " --build-log \"%{prj.location}/build/%{file.relpath}.log\"" .. " --build-log \"%{prj.location}/build/%{file.relpath}.log\""
.. " %{file.relpath}" .. " %{file.relpath}"