Rename ZoneCodeGeneratorNew to ZoneCodeGenerator.

Cleaning build folder might be required to prevent errors due to previous c# project
This commit is contained in:
Jan 2021-03-01 14:39:29 +01:00
parent f85c82f487
commit 1a09ad4396
4 changed files with 16 additions and 16 deletions

View File

@ -134,7 +134,7 @@ include "src/Unlinker.lua"
include "src/Utils.lua"
include "src/ZoneCode.lua"
include "src/ZoneCodeGeneratorLib.lua"
include "src/ZoneCodeGeneratorNew.lua"
include "src/ZoneCodeGenerator.lua"
include "src/ZoneCommon.lua"
include "src/ZoneLoading.lua"
include "src/ZoneWriting.lua"
@ -161,7 +161,7 @@ group ""
group "Tools"
Linker:project()
Unlinker:project()
ZoneCodeGeneratorNew:project()
ZoneCodeGenerator:project()
group ""
-- ========================

View File

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

View File

@ -1,29 +1,29 @@
ZoneCodeGeneratorNew = {}
ZoneCodeGenerator = {}
function ZoneCodeGeneratorNew:include()
function ZoneCodeGenerator:include()
if References:include(self:name()) then
includedirs {
path.join(ProjectFolder(), "ZoneCodeGeneratorNew")
path.join(ProjectFolder(), "ZoneCodeGenerator")
}
end
Utils:include()
end
function ZoneCodeGeneratorNew:link()
function ZoneCodeGenerator:link()
if References:link(self:name()) then
links(self:name())
end
end
function ZoneCodeGeneratorNew:use()
function ZoneCodeGenerator:use()
dependson(self:name())
end
function ZoneCodeGeneratorNew:name()
return "ZoneCodeGeneratorNew"
function ZoneCodeGenerator:name()
return "ZoneCodeGenerator"
end
function ZoneCodeGeneratorNew:project()
function ZoneCodeGenerator:project()
References:reset()
local folder = ProjectFolder();
@ -34,12 +34,12 @@ function ZoneCodeGeneratorNew:project()
language "C++"
files {
path.join(folder, "ZoneCodeGeneratorNew/**.h"),
path.join(folder, "ZoneCodeGeneratorNew/**.cpp")
path.join(folder, "ZoneCodeGenerator/**.h"),
path.join(folder, "ZoneCodeGenerator/**.cpp")
}
vpaths {
["*"] = {
path.join(folder, "ZoneCodeGeneratorNew"),
path.join(folder, "ZoneCodeGenerator"),
}
}