Skip to content

Commit

Permalink
Branch curl, #307 - copy libcurl.dylib at build time.
Browse files Browse the repository at this point in the history
* osx does not work on this branch.
  • Loading branch information
Cecil committed Aug 20, 2017
1 parent da591ad commit 3c7cbf8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
6 changes: 4 additions & 2 deletions make/darwin/xmavericks/env.rb
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@
LINUX_LIBS = " -l#{RUBY_SO} -L#{ShoesDeps}/lib -l cairo -L#{ShoesDeps}/lib -lpangocairo-1.0 -L#{ShoesDeps}/lib -lgif -ljpeg"
LINUX_LIBS << " -L#{TGT_DIR} #{CAIRO_LDFLAGS} #{PANGO_LDFLAGS} #{GLIB_LDFLAGS}"

# build wants the following Constant, but OSX build won't use it
SOLOCS = {}
libdll = "#{ShoesDeps}/lib"
SOLOCS = {
#'curl' => "#{libdll}/libcurl.dylib"
}

3 changes: 3 additions & 0 deletions make/darwin/xmavericks/setup.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ def static_setup (so_list)
# copy include files - it might help build gems
mkdir_p "#{TGT_DIR}/lib/ruby/include/ruby-#{rbvt}"
cp_r "#{EXT_RUBY}/include/ruby-#{rbvt}/", "#{TGT_DIR}/lib/ruby/include"
SOLOCS.each do |k, v|
cp v, TGT_DIR
end

# copy some static stuff
cp_r "fonts", "#{TGT_DIR}/fonts"
Expand Down

0 comments on commit 3c7cbf8

Please sign in to comment.