diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-08-03 09:50:41 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-08-03 09:50:41 +0000 |
| commit | 5222760bc4062f4ce0f8a2c46961fb4cb26682f1 (patch) | |
| tree | 8cb43e1d3e273d64588df7db13cd2aeb7ca99b65 /lib/mkmf.rb | |
| parent | d65b573aea73565ac4db34c3ab403c9f734fbfd2 (diff) | |
matz - nakada win32 patch
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@872 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/mkmf.rb')
| -rw-r--r-- | lib/mkmf.rb | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index cab2b769a7..0d67687638 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -385,12 +385,14 @@ hdrdir = #{$hdrdir} CC = #{CONFIG["CC"]} -CFLAGS = #{CONFIG["CCDLFLAGS"]} -I$(hdrdir) #{CFLAGS} #{$CFLAGS} -I#{CONFIG["includedir"]} #{$defs.join(" ")} +CFLAGS = #{CONFIG["CCDLFLAGS"]} #{CFLAGS} #{$CFLAGS} +CPPFLAGS = -I$(hdrdir) -I#{CONFIG["includedir"]} #{$defs.join(" ")} CXXFLAGS = $(CFLAGS) DLDFLAGS = #{$DLDFLAGS} #{$LDFLAGS} LDSHARED = #{CONFIG["LDSHARED"]} #{defflag} RUBY_INSTALL_NAME = #{CONFIG["RUBY_INSTALL_NAME"]} +RUBY_SO_NAME = #{CONFIG["RUBY_SO_NAME"]} DESTDIR = prefix = $(DESTDIR)#{CONFIG["prefix"]} @@ -444,11 +446,23 @@ EOMF install_rb(mfile, "$(sitelibdir)") mfile.printf "\n" + if /mswin32/ =~ RUBY_PLATFORM + mfile.print " +.c.obj: + $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< + +{$(srcdir)}.c.obj: + $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< + +" + end + if CONFIG["DLEXT"] != $OBJEXT - mfile.printf <<EOMF -$(DLLIB): $(OBJS) - $(LDSHARED) $(DLDFLAGS) -o $(DLLIB) $(OBJS) $(LIBS) $(LOCAL_LIBS) -EOMF + mfile.print "$(DLLIB): $(OBJS)\n" + if /mswin32/ =~ RUBY_PLATFORM + mfile.print "\tset LIB=$(topdir:/=\\);$(LIB)\n" + end + mfile.print "\t$(LDSHARED) $(DLDFLAGS) -o $(DLLIB) $(OBJS) $(LIBS) $(LOCAL_LIBS)\n" elsif not File.exist?(target + ".c") and not File.exist?(target + ".cc") mfile.print "$(DLLIB): $(OBJS)\n" case RUBY_PLATFORM @@ -476,7 +490,7 @@ $libs = CONFIG["DLDLIBS"] $local_flags = "" case RUBY_PLATFORM when /mswin32/ - $local_flags = "rubymw.lib -link /LIBPATH:$(topdir) /EXPORT:Init_$(TARGET)" + $local_flags = "$(RUBY_SO_NAME).lib -link /EXPORT:Init_$(TARGET)" end $LOCAL_LIBS = "" $defs = [] |