make zonecode use the new zonecode generator to generate its code

This commit is contained in:
Jan 2021-02-20 03:30:45 +01:00
parent ed47d514e1
commit a2fe10bba6

View File

@ -183,14 +183,14 @@ function ZoneCode:project()
} }
} }
ZoneCodeGenerator:use() ZoneCodeGeneratorNew:use()
filter "files:**.gen" filter "files:**.gen"
buildmessage "Generating ZoneCode for game %{file.basename}" buildmessage "Generating ZoneCode for game %{file.basename}"
buildcommands { buildcommands {
'"' .. TargetDirectoryLib .. '/ZoneCodeGenerator.exe"' '"' .. TargetDirectoryBin .. '/ZoneCodeGeneratorNew.exe"'
.. ' -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') .. '"'
.. ' -e "' .. 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"'
.. ' -g * ZoneLoad' .. ' -g * ZoneLoad'
.. ' -g * ZoneWrite' .. ' -g * ZoneWrite'
@ -200,7 +200,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(), "ZoneCommon/Game/%{file.basename}/%{file.basename}_Assets.h"), path.join(ProjectFolder(), "ZoneCommon/Game/%{file.basename}/%{file.basename}_Assets.h"),
TargetDirectoryLib .. "/ZoneCodeGenerator.exe" TargetDirectoryBin .. "/ZoneCodeGeneratorNew.exe"
} }
filter {} filter {}