Skip to content

Commit 30fe805

Browse files
committed
fix: sort xmake options
1 parent c679be1 commit 30fe805

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

xmake.lua

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,6 @@ add_rules("mode.debug", "mode.releasedbg")
1515
includes("xmake-rules.lua")
1616

1717
-- define options
18-
option("skyrim_ae", function()
19-
set_default(false)
20-
set_description("Enable support for Skyrim AE")
21-
add_defines("SKYRIM_SUPPORT_AE=1")
22-
end)
23-
24-
option("skse_xbyak", function()
25-
set_default(false)
26-
set_description("Enable trampoline support for Xbyak")
27-
add_defines("SKSE_SUPPORT_XBYAK=1")
28-
end)
29-
3018
option("rex_ini")
3119
set_default(false)
3220
set_description("Enable ini config support for REX")
@@ -45,14 +33,22 @@ option("rex_toml")
4533
add_defines("REX_OPTION_TOML=1")
4634
option_end()
4735

36+
option("skyrim_ae", function()
37+
set_default(false)
38+
set_description("Enable support for Skyrim AE")
39+
add_defines("SKYRIM_SUPPORT_AE=1")
40+
end)
41+
42+
option("skse_xbyak", function()
43+
set_default(false)
44+
set_description("Enable trampoline support for Xbyak")
45+
add_defines("SKSE_SUPPORT_XBYAK=1")
46+
end)
47+
4848
-- require packages
4949
add_requires("rsm-binary-io")
5050
add_requires("spdlog", { configs = { header_only = false, wchar = true, std_format = true } })
5151

52-
if has_config("skse_xbyak") then
53-
add_requires("xbyak")
54-
end
55-
5652
if has_config("rex_ini") then
5753
add_requires("simpleini")
5854
end
@@ -65,6 +61,10 @@ if has_config("rex_toml") then
6561
add_requires("toml11")
6662
end
6763

64+
if has_config("skse_xbyak") then
65+
add_requires("xbyak")
66+
end
67+
6868
-- define targets
6969
target("commonlibsse", function()
7070
-- set target kind
@@ -76,10 +76,6 @@ target("commonlibsse", function()
7676
-- add packages
7777
add_packages("rsm-binary-io", "spdlog", { public = true })
7878

79-
if has_config("skse_xbyak") then
80-
add_packages("xbyak", { public = true })
81-
end
82-
8379
if has_config("rex_ini") then
8480
add_packages("simpleini", { public = true })
8581
end
@@ -92,8 +88,12 @@ target("commonlibsse", function()
9288
add_packages("toml11", { public = true })
9389
end
9490

91+
if has_config("skse_xbyak") then
92+
add_packages("xbyak", { public = true })
93+
end
94+
9595
-- add options
96-
add_options("skyrim_ae", "skse_xbyak", "rex_ini", "rex_json", "rex_toml", { public = true })
96+
add_options("rex_ini", "rex_json", "rex_toml", "skyrim_ae", "skse_xbyak", { public = true })
9797

9898
-- add system links
9999
add_syslinks("advapi32", "bcrypt", "d3d11", "d3dcompiler", "dbghelp", "dxgi", "ole32", "shell32", "user32", "version")

0 commit comments

Comments
 (0)