From 3c7cbf8663310648ed0aebf1c9a5c960956fb0ea Mon Sep 17 00:00:00 2001 From: Cecil Date: Sat, 19 Aug 2017 19:04:53 -0600 Subject: [PATCH] Branch curl, #307 - copy libcurl.dylib at build time. * osx does not work on this branch. --- make/darwin/xmavericks/env.rb | 6 ++++-- make/darwin/xmavericks/setup.rb | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/make/darwin/xmavericks/env.rb b/make/darwin/xmavericks/env.rb index 87587094..4086dfa6 100644 --- a/make/darwin/xmavericks/env.rb +++ b/make/darwin/xmavericks/env.rb @@ -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" +} diff --git a/make/darwin/xmavericks/setup.rb b/make/darwin/xmavericks/setup.rb index acc36fbe..fc97c59b 100644 --- a/make/darwin/xmavericks/setup.rb +++ b/make/darwin/xmavericks/setup.rb @@ -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"