Merge pull request #7 from tkelman/windll2

lindahua · lindahua · commit 435301f18bc0 · 2014-04-13T10:54:20.000-04:00
Use WinRPM to download libxml2 dll
diff --git a/REQUIRE b/REQUIRE
@@ -1 +1,3 @@
 julia 0.2-
+@windows BinDeps
+@windows WinRPM
diff --git a/deps/build.jl b/deps/build.jl
@@ -0,0 +1,11 @@
+using BinDeps
+
+@BinDeps.setup
+
+@windows_only begin
+libxml2 = library_dependency("libxml2", aliases = ["libxml2-2"])
+using WinRPM
+provides(WinRPM.RPM, "libxml2", libxml2, os = :Windows)
+end
+
+@BinDeps.install
diff --git a/src/clib.jl b/src/clib.jl
@@ -1,6 +1,7 @@
 # C functions in the library
 
-const libxml2 = dlopen("libxml2", RTLD_GLOBAL)
+@unix_only const libxml2 = dlopen("libxml2", RTLD_GLOBAL)
+@windows_only const libxml2 = dlopen(Pkg.dir("WinRPM","deps","usr","$(Sys.ARCH)-w64-mingw32","sys-root","mingw","bin","libxml2-2"))
 
 macro lx2func(fname)  # the macro to get functions from libxml2
 	quote
