diff options
| author | lebao3105 <[email protected]> | 2026-01-18 18:24:02 +0700 |
|---|---|---|
| committer | ruki <[email protected]> | 2026-01-23 23:16:32 +0800 |
| commit | 0e9aa3375f073fd9987867574854f0445d6a3971 (patch) | |
| tree | 7fc409a8a675441d1673358fcace80672f5a9573 | |
| parent | 18ffb736a64aa3cd79310da253f9277d8b8ca279 (diff) | |
Update nameflags list
| -rw-r--r-- | xmake/languages/pascal/xmake.lua | 28 | ||||
| -rw-r--r-- | xmake/modules/core/tools/fpc.lua | 4 |
2 files changed, 25 insertions, 7 deletions
diff --git a/xmake/languages/pascal/xmake.lua b/xmake/languages/pascal/xmake.lua index 75806b56b..2ff4c0615 100644 --- a/xmake/languages/pascal/xmake.lua +++ b/xmake/languages/pascal/xmake.lua @@ -34,9 +34,6 @@ language("pascal") object = { "config.includedirs" , "config.unitdirs" - , "target.linkdirs" - , "target.rpathdirs" - , "target.strip" , "target.symbols" , "target.warnings" , "target.defines" @@ -55,15 +52,20 @@ language("pascal") , "toolchain.undefines" , "toolchain.objectdirs" , "toolchain.exceptions" - , "toolchain.linkdirs" - , "toolchain.rpathdirs" - , "toolchain.strip" } , binary = { "config.includedirs" , "config.unitdirs" + , "config.linkdirs" + , "config.frameworks" + , "config.frameworkdirs" + , "config.rpathdirs" + , "config.syslinks" , "target.linkdirs" , "target.rpathdirs" + , "target.syslinks" + , "target.frameworks" + , "target.frameworkdirs" , "target.strip" , "target.symbols" , "target.warnings" @@ -86,12 +88,23 @@ language("pascal") , "toolchain.linkdirs" , "toolchain.rpathdirs" , "toolchain.strip" + , "toolchain.syslinks" + , "toolchain.frameworks" + , "toolchain.frameworkdirs" } , shared = { "config.includedirs" , "config.unitdirs" + , "config.linkdirs" + , "config.frameworks" + , "config.frameworkdirs" + , "config.rpathdirs" + , "config.syslinks" , "target.linkdirs" , "target.rpathdirs" + , "target.syslinks" + , "target.frameworks" + , "target.frameworkdirs" , "target.strip" , "target.symbols" , "target.warnings" @@ -114,6 +127,9 @@ language("pascal") , "toolchain.linkdirs" , "toolchain.rpathdirs" , "toolchain.strip" + , "toolchain.syslinks" + , "toolchain.frameworks" + , "toolchain.frameworkdirs" } } diff --git a/xmake/modules/core/tools/fpc.lua b/xmake/modules/core/tools/fpc.lua index 79cc4d62a..b6d7e80c2 100644 --- a/xmake/modules/core/tools/fpc.lua +++ b/xmake/modules/core/tools/fpc.lua @@ -138,8 +138,10 @@ function nf_language(self, language) end -- make the exception flag +-- considering this applies to all dialects, +-- make this only accept on/off function nf_exception(self, exp) - return {exp:startswith("no-") and "-Sx-" or "-Sx"} + return {exp == "off" and "-Sx-" or "-Sx"} end -- make the objectdir flag |