summaryrefslogtreecommitdiff
path: root/core/src
diff options
context:
space:
mode:
authorruki <[email protected]>2023-02-01 23:36:33 +0800
committerruki <[email protected]>2023-02-01 23:36:33 +0800
commit55c4f104efb11e06115f9b24f1b37590c03e732a (patch)
treea8e9ecdc1db4821b331ef466bc2cc8b7fcbe87ec /core/src
parent998b62a1d550b987c692c86f45773ec688787fce (diff)
improve xmake.lua for haiku
Diffstat (limited to 'core/src')
-rw-r--r--core/src/demo/xmake.lua8
m---------core/src/tbox/tbox0
2 files changed, 5 insertions, 3 deletions
diff --git a/core/src/demo/xmake.lua b/core/src/demo/xmake.lua
index 34bf4c0d2..6f5e3e431 100644
--- a/core/src/demo/xmake.lua
+++ b/core/src/demo/xmake.lua
@@ -27,16 +27,18 @@ target("demo")
-- add links
if is_plat("windows") then
- add_links("ws2_32", "advapi32", "shell32")
+ add_syslinks("ws2_32", "advapi32", "shell32")
add_ldflags("/export:malloc", "/export:free", "/export:memmove")
elseif is_plat("android") then
- add_links("m", "c")
+ add_syslinks("m", "c")
elseif is_plat("macosx") and is_config("runtime", "luajit") then
add_ldflags("-all_load", "-pagezero_size 10000", "-image_base 100000000")
elseif is_plat("mingw") then
add_ldflags("-static-libgcc", {force = true})
+ elseif is_plat("haiku") then
+ add_syslinks("pthread", "network", "m", "c")
else
- add_links("pthread", "dl", "m", "c")
+ add_syslinks("pthread", "dl", "m", "c")
end
-- enable xp compatibility mode
diff --git a/core/src/tbox/tbox b/core/src/tbox/tbox
-Subproject bcb304451b25f5df20472e421cd164727d8f8da
+Subproject 5639514131a4e814738b38664ecf070ad50b76a