[cairo-commit] rcairo extconf.rb,1.13,1.14

Kouhei Sutou commit at pdx.freedesktop.org
Thu Apr 3 21:32:57 PDT 2008


Committed by: kou

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

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


Index: extconf.rb
===================================================================
RCS file: /cvs/cairo/rcairo/extconf.rb,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- extconf.rb	4 Apr 2008 04:34:06 -0000	1.13
+++ extconf.rb	4 Apr 2008 04:37:03 -0000	1.14
@@ -107,7 +107,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



More information about the cairo-commit mailing list