[cairo-commit] rcairo ChangeLog,1.212,1.213 extconf.rb,1.9,1.10

[Kouhei Sutou]

Committed by: kou

Update of /cvs/cairo/rcairo
In directory kemper:/tmp/cvs-serv20290

Modified Files:
	ChangeLog extconf.rb 
Log Message:
* extconf.rb: support output option for MSVC.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/rcairo/ChangeLog,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -d -r1.212 -r1.213
--- ChangeLog	4 Apr 2008 03:52:31 -0000	1.212
+++ ChangeLog	4 Apr 2008 03:59:03 -0000	1.213
@@ -1,5 +1,7 @@
 2008-04-04  Kouhei Sutou  <kou at cozmixng.org>
 
+	* extconf.rb: support output option for MSVC.
+
 	* src/rb_cairo_path.c: remove garbages.
 
 	* extconf.rb: fix object file extension substitution.

Index: extconf.rb
===================================================================
RCS file: /cvs/cairo/rcairo/extconf.rb,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- extconf.rb	4 Apr 2008 03:44:27 -0000	1.9
+++ extconf.rb	4 Apr 2008 03:59:04 -0000	1.10
@@ -106,7 +106,14 @@
       vars = vars.join(" ")
       f.puts("#{name} = #{vars}")
     when /^\t\$\(CC\)/
-      line = "#{line.chomp} -o $@" if /-o/ !~ line
+      if PKGConfig.msvc?
+        output_option = "/Fo"
+      else
+        output_option = "-o"
+      end
+      unless /#{Regexp.escape(output_option)}/ =~ line
+        line = "#{line.chomp} #{output_option}$@"
+      end
       co = line
       f.puts(line)
     else