[cairo-commit] rcairo ChangeLog,1.216,1.217 extconf.rb,1.11,1.12
Kouhei Sutou
commit at pdx.freedesktop.org
Thu Apr 3 21:28:05 PDT 2008
Committed by: kou
Update of /cvs/cairo/rcairo
In directory kemper:/tmp/cvs-serv30992
Modified Files:
ChangeLog extconf.rb
Log Message:
* extconf.rb: fix IMPLIB path.
Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/rcairo/ChangeLog,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -d -r1.216 -r1.217
--- ChangeLog 4 Apr 2008 04:25:16 -0000 1.216
+++ ChangeLog 4 Apr 2008 04:32:11 -0000 1.217
@@ -1,5 +1,7 @@
2008-04-04 Kouhei Sutou <kou at cozmixng.org>
+ * extconf.rb: fix IMPLIB path.
+
* src/rb_cairo_constants.c: define dummy
rb_cairo_ps_level_from_ruby_object() just for creating cairo.lib.
Index: extconf.rb
===================================================================
RCS file: /cvs/cairo/rcairo/extconf.rb,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- extconf.rb 4 Apr 2008 04:17:26 -0000 1.11
+++ extconf.rb 4 Apr 2008 04:32:11 -0000 1.12
@@ -51,10 +51,9 @@
$DLDFLAGS << " --output-lib #{filename}" if filename
end
when /mswin32/
- filename = "libruby-#{target_name}.lib"
$DLDFLAGS.gsub!(/ --output-lib\s+[^ ]+/, '')
$DLDFLAGS.gsub!(/ \/IMPLIB:[^ ]+/, '')
- $DLDFLAGS << " /IMPLIB:#{filename}" if filename
+ $DLDFLAGS << " /IMPLIB:$(IMPLIB)"
when /darwin/
if have_macro("CAIRO_HAS_QUARTZ_SURFACE", ["cairo.h"])
checking_for("RubyCocoa") do
@@ -94,7 +93,9 @@
makefile.each_line do |line|
case line
when /^DLLIB\s*=\s*/
- f.print("DLLIB = #{ext_dir_name}/#{$POSTMATCH}")
+ dllib = $POSTMATCH
+ f.print("DLLIB = #{ext_dir_name}/#{dllib}")
+ f.print("IMPLIB = #{ext_dir_name}/libruby-#{dllib.gsub(/\..+?$/, '.lib')}")
when /^(SRCS)\s*=\s*/
name = $1
vars = $POSTMATCH.split.collect {|var| "$(srcdir)/#{var}"}.join(" ")
More information about the cairo-commit
mailing list