diff options
| author | Florian Frank <flori@ping.de> | 2009-11-18 03:15:09 +0100 |
|---|---|---|
| committer | Florian Frank <flori@ping.de> | 2009-11-18 03:15:09 +0100 |
| commit | ec20cdd9cc0f35155f67205af49c156be3423a9b (patch) | |
| tree | 0e255dc7de90f51c83050b7779fa08fc42161974 | |
| parent | 50bd71069ac2e627750245beadf0bfc8b00ed362 (diff) | |
| parent | ed5ba79525c1c957483b3378f1956b58d55faf27 (diff) | |
| download | json-ec20cdd9cc0f35155f67205af49c156be3423a9b.tar.gz | |
Merge commit 'ed5ba79525c1c957483b3378f1956b58d55faf27'
Conflicts:
Rakefile
| -rw-r--r-- | Rakefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -245,7 +245,7 @@ if defined?(Gem) and defined?(Rake::GemPackageTask) and defined?(Rake::Extension ext.config_script = 'extconf_parser.rb' ext.gem_spec = spec_ext ext.cross_compile = true - ext.cross_platform = 'i386-mswin32' + ext.cross_platform = %w[i386-mswin32 and i386-mingw32] ext.ext_dir = 'ext/json/ext' ext.lib_dir = 'lib/json/ext' end @@ -255,7 +255,7 @@ if defined?(Gem) and defined?(Rake::GemPackageTask) and defined?(Rake::Extension ext.config_script = 'extconf_generator.rb' ext.gem_spec = spec_ext ext.cross_compile = true - ext.cross_platform = 'i386-mswin32' + ext.cross_platform = %w[i386-mswin32 and i386-mingw32] ext.ext_dir = 'ext/json/ext' ext.lib_dir = 'lib/json/ext' end |