kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/tk/extconf.rb: support new tk scheme on mswin32.

Browse source 
fixed: [ruby-dev:25535]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7830 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2005-01-26 03:49:26 +00:00
parent d635cd73a5
commit e7d56fde5f
2 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Jan 26 12:45:16 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/tk/extconf.rb: support new tk scheme on mswin32.
fixed: [ruby-dev:25535]
Wed Jan 26 10:45:19 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (flock_winnt, flock_win95): unlock file even if

33
ext/tk/extconf.rb
View file

@ -307,25 +307,34 @@ if mac_need_framework ||
mk_tkutil << CLEANINGS.sub(/\$\(CLEANLIBS\)/, "$(CLEANLIBS) $(CLEANLIBS2)")
mk_tkutil << "\n\n"
mk_tkutil << "$(DLLIB2): $(OBJS2)\n\t"
DLDFLAGS2 = "#$LDFLAGS #$DLDFLAGS #$ARCH_FLAG".gsub(/\$\(DEFFILE\)/, '$(DEFFILE2)')
mk_tkutil << "DLDFLAGS2 = #{DLDFLAGS2}\n"
mk_tkutil << "DEFFILE2 = $(TARGET2)-$(arch).def\n" if EXPORT_PREFIX
mk_tkutil << "\n"
mk_tkutil << "$(DLLIB2): #{EXPORT_PREFIX ? '$(DEFFILE2) ':''}$(OBJS2)\n\t"
mk_tkutil << "@-$(RM) $@\n\t"
mk_tkutil << "@-$(RM) $(TARGET2).lib\n\t" if $mswin
LINK_SO2 = if CONFIG["DLEXT"] == $OBJEXT
"ld $(DLDFLAGS) -r -o $(DLLIB2) $(OBJS2)\n"
else
"$(LDSHARED) $(DLDFLAGS) $(LIBPATH) #{OUTFLAG}$(DLLIB2) " \
"$(OBJS2) $(LOCAL_LIBS) $(LIBS)"
end
LINK_SO2 = LINK_SO.gsub(/\$\(DLLIB\)/, '$(DLLIB2)').gsub(/\$\(OBJS\)/, '$(OBJS2)').gsub(/\$\(DLDFLAGS\)/, '$(DLDFLAGS2)')
mk_tkutil << LINK_SO2
mk_tkutil << "\n\n"
mk_tkutil << "$(STATIC_LIB2): $(OBJS2)\n\t"
mk_tkutil << "$(AR) #{config_string('ARFLAGS') || 'cru '}$@ $(OBJS2)"
if ranlib = config_string('RANLIB')
mk_tkutil << "\n\t@-#{ranlib} $(DLLIB2) 2> /dev/null || true"
unless $static.nil?
mk_tkutil << "$(STATIC_LIB2): $(OBJS2)\n\t"
mk_tkutil << "$(AR) #{config_string('ARFLAGS') || 'cru '}$@ $(OBJS2)"
if ranlib = config_string('RANLIB')
mk_tkutil << "\n\t@-#{ranlib} $(DLLIB2) 2> /dev/null || true"
end
end
mk_tkutil << "\n\n\n"
mk_tkutil << "\n\n"
if EXPORT_PREFIX
mk_tkutil << "$(DEFFILE2):\n"
mk_tkutil << %Q!\t$(RUBY) -e "puts 'EXPORTS', 'Init_$(TARGET2)'" > $@\n!
mk_tkutil << "\n\n"
end
mk_tkutil << "\n"
mk_tkutil << "install: $(RUBYARCHDIR)/$(DLLIB2)\n"
mk_tkutil << "$(RUBYARCHDIR)/$(DLLIB2): $(DLLIB2) $(RUBYARCHDIR)\n"