Explorar el Código

install pcre2 on windows

ruki hace 7 años
padre
commit
b83b580892
Se han modificado 3 ficheros con 15 adiciones y 11 borrados
  1. 6 5
      packages/l/luajit/xmake.lua
  2. 5 2
      packages/p/pcre2/xmake.lua
  3. 4 4
      packages/z/zlib/xmake.lua

+ 6 - 5
packages/l/luajit/xmake.lua

@@ -19,6 +19,12 @@ package("luajit")
         os.vrun("msvcbuild.bat")
     end)
 
+    on_install("windows", function (package)
+        os.cp("src/lua51.lib", package:installdir("lib"))
+        os.cp("src/lua51.dll", package:installdir("lib"))
+        os.cp("src/*.h", package:installdir("include"))
+    end)
+
     on_build("macosx", "linux", function (package)
         io.gsub("./Makefile", "export PREFIX= /usr/local", "export PREFIX=" .. package:installdir())
         os.vrun("make")
@@ -28,8 +34,3 @@ package("luajit")
         os.vrun("make install")
     end)
 
-    on_install("windows", function (package)
-        os.cp("src/lua51.lib", package:installdir("lib"))
-        os.cp("src/lua51.dll", package:installdir("lib"))
-        os.cp("src/*.h", package:installdir("include"))
-    end)

+ 5 - 2
packages/p/pcre2/xmake.lua

@@ -15,8 +15,11 @@ package("pcre2")
     end
 
     on_build("windows", function (package)
-        os.vrun("cmake .")
-        os.vrun("make")
+        import("package.builder.cmake").build(package)
+    end)
+
+    on_install("windows", function (package)
+        import("package.builder.cmake").install(package)
     end)
 
     on_build("macosx", "linux", function (package)

+ 4 - 4
packages/z/zlib/xmake.lua

@@ -14,14 +14,14 @@ package("zlib")
         os.vrun("make")
     end)
 
-    on_build("windows", function (package)
-        os.vrun("nmake -f win32\\Makefile.msc zlib.lib")
-    end)
-
     on_install("macosx", "linux", function (package)
         os.vrun("make install")
     end)
 
+    on_build("windows", function (package)
+        os.vrun("nmake -f win32\\Makefile.msc zlib.lib")
+    end)
+
     on_install("windows", function (package)
         os.cp("zlib.lib", package:installdir("lib"))
         os.cp("*.h", package:installdir("include"))