diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2014-11-22 13:12:08 -0800 |
---|---|---|
committer | Lamont Granquist <lamont@scriptkiddie.org> | 2014-11-22 13:12:08 -0800 |
commit | 4d1f5a64f25710b70aeec8e3b305b02a698a8f62 (patch) | |
tree | 07ac69c76b03f8e2310fbb4869f23cf808189295 | |
parent | 3d9f583f94cb233e9901a1ca2b07d2b9358f09f4 (diff) | |
parent | e11f81c3b5d00e11226c308b306e21ab7beb3969 (diff) | |
download | libyajl2-gem-4d1f5a64f25710b70aeec8e3b305b02a698a8f62.tar.gz |
Merge pull request #3 from electrawn/master
Add cygwin detection, better windows support
-rw-r--r-- | Rakefile | 2 | ||||
-rw-r--r-- | ext/libyajl2/extconf.rb | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -95,7 +95,7 @@ task :prep do # apply patches that haven't yet been pushed upstream Dir["#{build_path}/patches/*"].sort.each do |file| Dir.chdir build_path - sh "patch -p2 < #{file}" + sh "patch -p2 --binary < #{file}" end # generate the yajl_version.h header file without invoking cmake diff --git a/ext/libyajl2/extconf.rb b/ext/libyajl2/extconf.rb index 1e94507..0800f1f 100644 --- a/ext/libyajl2/extconf.rb +++ b/ext/libyajl2/extconf.rb @@ -24,7 +24,7 @@ module Libyajl2Build PREFIX = File.expand_path("../../../lib/libyajl2/vendored-libyajl2", __FILE__).freeze def self.windows? - !!(RUBY_PLATFORM =~ /mswin|mingw|windows/) + !!(RUBY_PLATFORM =~ /mswin|mingw|cygwin|windows/) end def self.libyajl2_vendor_dir |