diff options
Diffstat (limited to 'ext/ffi_yajl/ext')
-rw-r--r-- | ext/ffi_yajl/ext/encoder/extconf.rb | 16 | ||||
-rw-r--r-- | ext/ffi_yajl/ext/parser/extconf.rb | 14 |
2 files changed, 19 insertions, 11 deletions
diff --git a/ext/ffi_yajl/ext/encoder/extconf.rb b/ext/ffi_yajl/ext/encoder/extconf.rb index ee0a787..9d048ee 100644 --- a/ext/ffi_yajl/ext/encoder/extconf.rb +++ b/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' diff --git a/ext/ffi_yajl/ext/parser/extconf.rb b/ext/ffi_yajl/ext/parser/extconf.rb index 70c3b0e..602f679 100644 --- a/ext/ffi_yajl/ext/parser/extconf.rb +++ b/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' |