diff --git a/README.md b/README.md index 78585b7..89f0e07 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,15 @@ Pkg.test("ArrayFire") ``` If you have any issues getting `ArrayFire.jl` to work, please check the Troubleshooting section below. If it still doesn't work, please file an issue. +#Windows +Just download the [installer](http://arrayfire.com/download/) (you need to create an account). +Follow the installation steps and make sure that you include the library directory into the PATH variable as advised by the installer. +Now try: +```julia +Pkg.add("ArrayFire") +Pkg.test("ArrayFire") +``` + ## Simple Usage Congratulations, you've now installed `ArrayFire.jl`! Now what can you do? diff --git a/src/config.jl b/src/config.jl index 19907e2..82a6074 100644 --- a/src/config.jl +++ b/src/config.jl @@ -2,10 +2,10 @@ let global af_lib succeeded = false if !isdefined(:af_lib) - @unix ? begin lib = "libaf" end : nothing + lib = @unix ? begin "libaf" end : @windows ? "af" : "" Libdl.dlopen(lib) succeeded = true - succeeded || error("Gunrock library not found") + succeeded || error("ArrayFire library not found") @eval const af_lib = $lib end end diff --git a/src/error.jl b/src/error.jl index 512172b..acec75e 100644 --- a/src/error.jl +++ b/src/error.jl @@ -45,7 +45,7 @@ export AF_SUCCESS, AF_ERR_UNKNOWN function throwAFerror(err::Integer) - str = ccall((:af_err_to_string, "libaf"), + str = ccall((:af_err_to_string, af_lib), Cstring, (Cint, ), err) throw("ArrayFire Error ($err) : $(bytestring(str))") end