diff options
| author | Florian Frank <flori@ping.de> | 2009-11-18 19:17:27 +0100 |
|---|---|---|
| committer | Florian Frank <flori@ping.de> | 2009-11-18 19:17:27 +0100 |
| commit | d20b3041b5caba695f5bffd187f2bd9c37fe104b (patch) | |
| tree | c8cc2b599708b105279262c692b4293fd9a96517 /Rakefile | |
| parent | e47334c7d44b0b904df199fdb0a929abf91ca73b (diff) | |
| parent | 31132c364e92eb887f7d1c4178f71930a8e35c5d (diff) | |
| download | json-d20b3041b5caba695f5bffd187f2bd9c37fe104b.tar.gz | |
Merge commit '31132c364e92eb887f7d1c4178f71930a8e35c5d'
Conflicts:
Rakefile
Diffstat (limited to '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 = %w[i386-mswin32 and i386-mingw32] + ext.cross_platform = %w[i386-mswin32 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 = %w[i386-mswin32 and i386-mingw32] + ext.cross_platform = %w[i386-mswin32 i386-mingw32] ext.ext_dir = 'ext/json/ext' ext.lib_dir = 'lib/json/ext' end |