diff options
| author | ruki <[email protected]> | 2021-02-27 13:49:29 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-02-27 13:49:29 +0800 |
| commit | 06d15cea2ee275a82a4630147dc6aa9a33bbaf53 (patch) | |
| tree | 3fe36e57f14364dee6b34c6eb7bcd2fd3b9af7ac /core/src | |
| parent | 1cef4b3d84413c1d9155c5152d7c709f655b4067 (diff) | |
fix core/xmake.lua
Diffstat (limited to 'core/src')
| -rw-r--r-- | core/src/lcurses/xmake.lua | 20 | ||||
| -rw-r--r-- | core/src/luajit/xmake.lua | 6 |
2 files changed, 9 insertions, 17 deletions
diff --git a/core/src/lcurses/xmake.lua b/core/src/lcurses/xmake.lua index 9588518be..f80117f10 100644 --- a/core/src/lcurses/xmake.lua +++ b/core/src/lcurses/xmake.lua @@ -1,25 +1,15 @@ --- add target target("lcurses") - - -- enable this target? - if not has_config("curses") and not has_config("pdcurses") then - set_default(false) - end - - -- make as a static library set_kind("static") - - -- add deps add_deps("luajit") if is_plat("windows") and has_config("pdcurses") then add_deps("pdcurses") + add_defines("XM_CONFIG_API_HAVE_CURSES", {public = true}) + elseif has_config("curses") then + add_defines("XM_CONFIG_API_HAVE_CURSES", {public = true}) + else + set_default(false) end - - -- add the common source files add_files("lcurses.c") - add_defines("XM_CONFIG_API_HAVE_CURSES", {public = true}) - - -- add options if is_plat("windows") then add_options("pdcurses") set_languages("c89") diff --git a/core/src/luajit/xmake.lua b/core/src/luajit/xmake.lua index aa5c1d7a2..85b796331 100644 --- a/core/src/luajit/xmake.lua +++ b/core/src/luajit/xmake.lua @@ -2,9 +2,11 @@ local jit = true local plat = "$(plat)" local arch = "$(arch)" -if is_plat("msys", "cygwin") then +if is_plat("msys", "mingw", "cygwin") then plat = "windows" arch = is_arch("x86_64") and "x64" or "x86" +elseif is_plat("android") then + plat = "linux" end if is_arch("arm64", "arm64-v8a") then arch = "arm64" @@ -44,7 +46,7 @@ target("luajit") add_files("luajit/src/*.c|ljamalg.c|luajit.c") if is_plat("windows") then add_files(autogendir .. "/lj_vm.obj") - elseif is_plat("msys", "cygwin") then + elseif is_plat("msys", "cygwin", "mingw") then add_files(autogendir .. "/lj_vm.o") else add_files(autogendir .. "/*.S") |