From 0f485bf24d85e49a337c5c1e9654b36732f46a5b Mon Sep 17 00:00:00 2001
From: fasiondog <fasiondog@163.com>
Date: Sun, 26 Mar 2023 15:48:51 +0800
Subject: [PATCH] =?UTF-8?q?flatbuffers,=20nng=20=E6=B7=BB=E5=8A=A0=20cross?=
 =?UTF-8?q?=20=E6=94=AF=E6=8C=81=20(#1953)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* add sqlcipher

* sqlcipher on windows

* update sqlchipher

* update sqlcipher

* update sqlcipher

* update sqlchiper

* update sqlcipher

* update sqlcipher

* update sqlcipher

* fixed sqlcipher

* update sqlcipher

* update sqlcipher

* update sqlcipher

* update sqlcipher

* update sqlcipher

* flatbuffers, nng 加入 cross

* update flatbuufers

* nngpp add cross; nng 补充windows下的系统链接库

* update nng
---
 packages/f/flatbuffers/xmake.lua | 6 ++++--
 packages/n/nng/xmake.lua         | 4 +++-
 packages/n/nngpp/xmake.lua       | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/f/flatbuffers/xmake.lua b/packages/f/flatbuffers/xmake.lua
index 7453f7045..bfaec8afb 100644
--- a/packages/f/flatbuffers/xmake.lua
+++ b/packages/f/flatbuffers/xmake.lua
@@ -11,7 +11,7 @@ package("flatbuffers")
     add_versions("v23.1.21", "48597d6a6f8ca67a02ae8d8494b3bfc9136eb93da60a538d5bfc024f7c564f97")
 
     add_deps("cmake")
-    on_install("windows", "linux", "macosx", "mingw", "android", "iphoneos", function(package)
+    on_install("windows", "linux", "macosx", "mingw", "android", "iphoneos", "cross", function(package)
         local configs = {"-DFLATBUFFERS_BUILD_TESTS=OFF"}
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
         table.insert(configs, "-DFLATBUFFERS_BUILD_SHAREDLIB=" .. (package:config("shared") and "ON" or "OFF"))
@@ -20,7 +20,9 @@ package("flatbuffers")
             table.insert(configs, "-DFLATBUFFERS_BUILD_FLATHASH=OFF")
         end
         import("package.tools.cmake").install(package, configs)
-        package:addenv("PATH", "bin")
+        if not package:is_cross() then
+            package:addenv("PATH", "bin")
+        end
     end)
 
     on_test(function(package)
diff --git a/packages/n/nng/xmake.lua b/packages/n/nng/xmake.lua
index 29d882022..ab5422369 100644
--- a/packages/n/nng/xmake.lua
+++ b/packages/n/nng/xmake.lua
@@ -36,6 +36,8 @@ package("nng")
 
     if is_plat("linux") then
         add_syslinks("pthread")
+    elseif is_plat("windows") then 
+        add_syslinks("ws2_32", "advapi32")
     end
 
     on_load(function (package)
@@ -48,7 +50,7 @@ package("nng")
     end)
 
     add_deps("cmake")
-    on_install("windows", "linux", "macosx", "android", "iphoneos", function(package)
+    on_install("windows", "linux", "macosx", "android", "iphoneos", "cross", function(package)
         local configs = {"-DNNG_TESTS=OFF", "-DNNG_ENABLE_NNGCAT=OFF"}
         table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
         for name, enabled in pairs(package:configs()) do
diff --git a/packages/n/nngpp/xmake.lua b/packages/n/nngpp/xmake.lua
index f3661c0e2..a36105049 100644
--- a/packages/n/nngpp/xmake.lua
+++ b/packages/n/nngpp/xmake.lua
@@ -8,7 +8,7 @@ package("nngpp")
 
     add_deps("nng")
     add_deps("cmake")
-    on_install("windows", "linux", "macosx", "android", "iphoneos", function (package)
+    on_install("windows", "linux", "macosx", "android", "iphoneos", "cross", function (package)
         import("package.tools.cmake").install(package, configs)
     end)