ffi-yajl 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ea13f5cd3d083b7f3eb9e37fd096aac99084e85
-  data.tar.gz: 5503b294adb725c70a1f8645bde0269ea4892f9d
+  metadata.gz: 7fc1e4d856cb2a0f70f69d21fb2480e6c81cd602
+  data.tar.gz: 8d058ff7aa83ba76370f0955182e673a1e76f94a
 SHA512:
-  metadata.gz: b9d92fad2aa9af3192db242f555defc51d5fef487a7a0beda40c484ce1ce539e9119353554692dc36f309a294a91402b78b950faa2bba034a9d7addf4729df4e
-  data.tar.gz: b88476c6397cc61936ff10fa4c690ad0eabaf81e6f4ef9ef136611d75a476c0f18b66784f07df9e95e9f1a6d8fff3d42be1f209098ec379391ef62c0df0127a4
+  metadata.gz: 19a465ce3288cce49d3f9a7828d6b4f9081238d7b88340f2822413af3afa207d61ac18bcd610b9b445f3b072c29de30232cb67f73be684781daf2cf4bb1c7afd
+  data.tar.gz: 66485e276cfa5ff2e0581c663ca2544d110c1ecae0e0d1dc1aa9fb4b706c23db818e5b85166154805053925a0403d42c0f5a6e47ced5e059bda8ec0b6b0cc258

data/ext/ffi_yajl/ext/encoder/extconf.rb

@@ -2,14 +2,11 @@ require 'mkmf'
 require 'rubygems'
 require 'libyajl2'
 
-# the customer is always right, ruby is always compiled to be stupid
-$CFLAGS = ENV['CFLAGS'] if ENV['CFLAGS']
-$LDFLAGS = ENV['LDFLAGS'] if ENV['LDFLAGS']
 RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
 
 # pick up the vendored libyajl2 out of the libyajl2 gem
-$CFLAGS = "-I#{Libyajl2.include_path} -L#{Libyajl2.opt_path} #{$CFLAGS}"
-$LDFLAGS = "-L#{Libyajl2.opt_path} #{$LDFLAGS}"
+$CFLAGS = " -I#{Libyajl2.include_path} #{$CFLAGS}"
+$LDFLAGS = " -L#{Libyajl2.opt_path} #{$LDFLAGS}"
 
 puts $CFLAGS
 puts $LDFLAGS
@@ -22,7 +19,14 @@ if RbConfig::MAKEFILE_CONFIG['CC'] =~ /gcc|clang/
   $CFLAGS << " -Wall"
 end
 
-#$LDFLAGS << " -lyajl"
+def windows?
+  !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
+end
+
+if windows?
+  # include our libyajldll.a definitions on windows in the libyajl2 gem
+  $libs = "#{$libs} -lyajldll"
+end
 
 dir_config 'encoder'
 

data/ext/ffi_yajl/ext/parser/extconf.rb

@@ -2,13 +2,10 @@ require 'mkmf'
 require 'rubygems'
 require 'libyajl2'
 
-# the customer is always right, ruby is always compiled to be stupid
-$CFLAGS = ENV['CFLAGS'] if ENV['CFLAGS']
-$LDFLAGS = ENV['LDFLAGS'] if ENV['LDFLAGS']
 RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
 
 # pick up the vendored libyajl2 out of the libyajl2 gem
-$CFLAGS = "-I#{Libyajl2.include_path} -L#{Libyajl2.opt_path} #{$CFLAGS}"
+$CFLAGS = "-I#{Libyajl2.include_path} #{$CFLAGS}"
 $LDFLAGS = "-L#{Libyajl2.opt_path} #{$LDFLAGS}"
 
 puts $CFLAGS
@@ -22,7 +19,14 @@ if RbConfig::MAKEFILE_CONFIG['CC'] =~ /gcc|clang/
   $CFLAGS << " -Wall"
 end
 
-#$LDFLAGS << " -lyajl"
+def windows?
+  !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
+end
+
+if windows?
+  # include our libyajldll.a definitions on windows in the libyajl2 gem
+  $libs = "#{$libs} -lyajldll"
+end
 
 dir_config 'parser'
 

data/lib/ffi_yajl/version.rb

@@ -1,3 +1,3 @@
 module FFI_Yajl
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-yajl
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Lamont Granquist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake