Skip to content

Commit

Permalink
Merge df0ec6c into 2d75c95
Browse files Browse the repository at this point in the history
  • Loading branch information
tknopp committed Aug 15, 2018
2 parents 2d75c95 + df0ec6c commit 8d442bd
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions deps/build.jl
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ provides(Zypper,

const png_version = "1.5.14"

#=
provides(Sources,
Dict(
URI("http://www.cairographics.org/releases/pixman-0.28.2.tar.gz") => pixman,
Expand Down Expand Up @@ -125,6 +124,8 @@ provides(BuildProcess,

provides(BuildProcess,Autotools(libtarget = "libpng15.la"),libpng,os = :Unix)


if VERSION < v"1.0.0"
provides(SimpleBuild,
(@build_steps begin
GetSources(zlib)
Expand All @@ -134,6 +135,7 @@ provides(SimpleBuild,
#MakeTargets(["-fwin32/Makefile.gcc","DESTDIR=../../usr/","INCLUDE_PATH=include","LIBRARY_PATH=lib","SHARED_MODE=1","install"])
end
end),zlib, os = :Windows)
end

prefix=joinpath(BinDeps.depsdir(libpng),"usr")
uprefix = replace(replace(prefix,"\\","/"),"C:/","/c/")
Expand All @@ -157,7 +159,7 @@ provides(BuildProcess,
end)
end
end),libpng, os = :Windows)
=#


@BinDeps.install Dict([(:gobject, :_jl_libgobject),
(:cairo, :_jl_libcairo),
Expand Down

0 comments on commit 8d442bd

Please sign in to comment.