From fdd7ef24c0fd63f5b70883c6da0b2832e89e4ff6 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 7 May 2024 13:28:03 +0800 Subject: [PATCH] improve deps (#3973) * improve deps * update nmd * fix deps --- packages/n/nmd/xmake.lua | 2 ++ packages/r/rcmp/xmake.lua | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/n/nmd/xmake.lua b/packages/n/nmd/xmake.lua index 67200cb15..4ffdc9bf4 100644 --- a/packages/n/nmd/xmake.lua +++ b/packages/n/nmd/xmake.lua @@ -7,6 +7,8 @@ package("nmd") add_urls("https://github.com/Nomade040/nmd.git") add_versions("2021.03.28", "33ac3b62c7d1eb28ae6b71d4dd78aa133ef96488") + add_includedirs("include", "include/nmd") + on_install(function (package) os.cp("nmd_assembly.h", package:installdir("include/nmd")) os.cp("nmd_graphics.h", package:installdir("include/nmd")) diff --git a/packages/r/rcmp/xmake.lua b/packages/r/rcmp/xmake.lua index 6fd8d3d4f..6b4d0da80 100644 --- a/packages/r/rcmp/xmake.lua +++ b/packages/r/rcmp/xmake.lua @@ -9,12 +9,14 @@ package("rcmp") add_versions("v0.2.2", "accbf1d2c72b169857900ce816ca3c1718c63c9f67ded413613c236455a331d5") add_deps("cmake") + add_deps("nmd") on_install("linux", "windows", function (package) local configs = {} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) - import("package.tools.cmake").install(package, configs, {buildir = "build"}) + os.rm("external/nmd") + import("package.tools.cmake").install(package, configs, {packagedeps = "nmd", buildir = "build"}) local version = package:version() if version then package:add("defines", "RCMP_VERSION_MAJOR=" .. version:major())