ruki il y a 4 ans
Parent
commit
3fbf957820
1 fichiers modifiés avec 7 ajouts et 3 suppressions
  1. 7 3
      packages/s/sqlite3/xmake.lua

+ 7 - 3
packages/s/sqlite3/xmake.lua

@@ -10,11 +10,15 @@ package("sqlite3")
     add_versions("3.23.0", "b7711a1800a071674c2bf76898ae8584fc6c9643cfe933cfc1bc54361e3a6e49")
 
     on_install("windows", function (package)
-        os.vrun("nmake DEBUG=%s -f Makefile.msc DYNAMIC_SHELL=1 PLATFORM=%s USE_CRT_DLL=%s", package:debug() and "1" or "0", package:arch(), package:config("vs_runtime") == "MD" and "1" or "0")
+        local configs = {"-f", "Makefile.msc", "DYNAMIC_SHELL=1"}
+        table.insert(configs, "DEBUG=" .. (package:debug() and "1" or "0"))
+        table.insert(configs, "PLATFORM=" .. package:arch())
+        table.insert(configs, "USE_CRT_DLL=" .. (package:config("vs_runtime"):startswith("MD") and "1" or "0"))
+        import("package.tools.nmake").build(package, configs)
         os.cp("*.h", package:installdir("include"))
         os.cp("sqlite3.lib", package:installdir("lib"))
-        os.cp("sqlite3.pdb", package:installdir("lib"))
-        os.cp("sqlite3.dll", package:installdir("lib"))
+        os.cp("sqlite3.pdb", package:installdir("bin"))
+        os.cp("sqlite3.dll", package:installdir("bin"))
     end)
 
     on_install("macosx", "linux", function (package)