Skip to content

[FIX] Replace deprecated/removed flags by dedicated API #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jarod42 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[FIX] Replace deprecated/removed flags by dedicated API #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions codeblocks_auditor.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
if filecfg1.buildaction ~= filecfg2.buildaction then
return false, "buildaction"
end
if filecfg1.flags.ExcludeFromBuild ~= filecfg2.flags.ExcludeFromBuild then
return false, 'flags {"ExcludeFromBuild"}'
if filecfg1.excludefrombuild ~= filecfg2.excludefrombuild then
return false, "excludefrombuild"
end
if filecfg1.buildmessage ~= filecfg2.buildmessage then
return false, "buildmessage"
Expand Down
8 changes: 4 additions & 4 deletions codeblocks_cbp.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,15 +139,15 @@

if (cfg.kind == "SharedLib") then
_p(4,'<Option createDefFile="0" />')
_p(4,'<Option createStaticLib="%s" />', iif(cfg.flags.NoImportLib, 0, 1))
_p(4,'<Option createStaticLib="%s" />', iif(cfg.useimportlib, 0, 1))
end

-- begin compiler block --
_p(4,'<Compiler>')
for _,flag in ipairs(table.join(compiler.getcflags(cfg), compiler.getcxxflags(cfg), compiler.getdefines(cfg.defines), compiler.getundefines(cfg.undefines), cfg.buildoptions)) do
_p(5,'<Add option="%s" />', p.esc(flag))
end
if not cfg.flags.NoPCH and cfg.pchheader then
if cfg.enablepch ~= p.OFF and cfg.pchheader then
_p(5,'<Add option="-Winvalid-pch" />')
_p(5,'<Add option="-include &quot;%s&quot;" />', p.esc(cfg.pchheader))
end
Expand Down Expand Up @@ -259,7 +259,7 @@
local filecfg = p.fileconfig.getconfig(node, cfg)
if path.isresourcefile(node.name) then
_p(3,'<Option compilerVar="WINDRES" />')
elseif filecfg.flags.ExcludeFromBuild or filecfg.buildaction == "None" then
elseif filecfg.excludefrombuild or filecfg.buildaction == "None" then
_p(3, '<Option compile="0" />')
_p(3, '<Option link="0" />')
elseif (node.compileas and node.compileas ~= "Default") or p.fileconfig.hasFileSettings(filecfg) then
Expand All @@ -279,7 +279,7 @@
elseif path.iscfile(node.name) and prj.language == "C++" then
_p(3,'<Option compilerVar="CC" />')
end
if not prj.flags.NoPCH and node.name == pchheader then
if prj.enablepch ~= p.OFF and node.name == pchheader then
_p(3,'<Option compilerVar="%s" />', iif(prj.language == "C", "CC", "CPP"))
_p(3,'<Option compile="1" />')
_p(3,'<Option weight="0" />')
Expand Down