mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/extmk.rb.in: Use -F and -T for mswin32 because cl.exe doesn't support -o officially and cl.exe considers that *.cc and *.cxx are OBJs.
* lib/mkmf.rb: ditto. * win32/Makefile.sub: Use del instead of rm. All these changes are derived from Nobuyoshi Nakada's patch. Thanks. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1519 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
53a2b14909
commit
a5c0e5a382
5 changed files with 146 additions and 79 deletions
12
ChangeLog
12
ChangeLog
|
@ -1,3 +1,15 @@
|
||||||
|
Sat Jun 9 16:31:03 2001 Usaku Nakamura <usa@osb.att.ne.jp>
|
||||||
|
|
||||||
|
* ext/extmk.rb.in: Use -F and -T for mswin32 because cl.exe doesn't
|
||||||
|
support -o officially and cl.exe considers that *.cc and *.cxx are
|
||||||
|
OBJs.
|
||||||
|
|
||||||
|
* lib/mkmf.rb: ditto.
|
||||||
|
|
||||||
|
* win32/Makefile.sub: Use del instead of rm.
|
||||||
|
All these changes are derived from Nobuyoshi Nakada's patch.
|
||||||
|
Thanks.
|
||||||
|
|
||||||
Fri Jun 8 22:37:40 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
|
Fri Jun 8 22:37:40 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||||
|
|
||||||
* gc.c (Init_stack): avoid __builtin_frame_address(2) to retrieve
|
* gc.c (Init_stack): avoid __builtin_frame_address(2) to retrieve
|
||||||
|
|
|
@ -68,7 +68,12 @@ if RUBY_PLATFORM == "m68k-human"
|
||||||
else
|
else
|
||||||
CFLAGS = "@CFLAGS@"
|
CFLAGS = "@CFLAGS@"
|
||||||
end
|
end
|
||||||
LINK = "@CC@ -o conftest -I#$topdir -I#$top_srcdir #{CFLAGS} -I#$includedir @LDFLAGS@ %s %s %s conftest.c %s %s @LIBS@"
|
if /mswin32/ =~ RUBY_PLATFORM
|
||||||
|
OUTFLAG = '-Fe'
|
||||||
|
else
|
||||||
|
OUTFLAG = '-o '
|
||||||
|
end
|
||||||
|
LINK = "@CC@ #{OUTFLAG}conftest -I#$topdir -I#$top_srcdir #{CFLAGS} -I#$includedir @LDFLAGS@ %s %s %s conftest.c %s %s @LIBS@"
|
||||||
CPP = "@CPP@ @CPPFLAGS@ -I#$topdir -I#$top_srcdir #{CFLAGS} -I#$includedir %s %s %s conftest.c"
|
CPP = "@CPP@ @CPPFLAGS@ -I#$topdir -I#$top_srcdir #{CFLAGS} -I#$includedir %s %s %s conftest.c"
|
||||||
|
|
||||||
$log = open('extmk.log', 'w')
|
$log = open('extmk.log', 'w')
|
||||||
|
@ -496,44 +501,49 @@ EOS
|
||||||
install_rb(mfile, $srcdir)
|
install_rb(mfile, $srcdir)
|
||||||
mfile.printf "\n"
|
mfile.printf "\n"
|
||||||
|
|
||||||
unless /nmake/i =~ $make
|
unless /mswin32/ =~ RUBY_PLATFORM
|
||||||
unless /mswin32/ =~ RUBY_PLATFORM
|
src = '$<'
|
||||||
src = '$<'
|
copt = cxxopt = ''
|
||||||
|
else
|
||||||
|
if /nmake/i =~ $make
|
||||||
|
src = '$(<:\\=/)'
|
||||||
else
|
else
|
||||||
src = '$(subst /,\\\\,$<)'
|
src = '$(subst /,\\\\,$<)'
|
||||||
end
|
end
|
||||||
|
copt = '-Tc'
|
||||||
|
cxxopt = '-Tp'
|
||||||
|
end
|
||||||
|
unless /nmake/i =~ $make
|
||||||
mfile.puts "
|
mfile.puts "
|
||||||
.cc.@OBJEXT@:
|
.cc.@OBJEXT@:
|
||||||
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c #{src}
|
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c #{cxxopt}#{src}
|
||||||
.cpp.@OBJEXT@:
|
.cpp.@OBJEXT@:
|
||||||
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c #{src}
|
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c #{cxxopt}#{src}
|
||||||
.cxx.@OBJEXT@:
|
.cxx.@OBJEXT@:
|
||||||
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c #{src}
|
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c #{cxxopt}#{src}
|
||||||
.C.@OBJEXT@:
|
.C.@OBJEXT@:
|
||||||
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c #{src}
|
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c #{cxxopt}#{src}
|
||||||
|
|
||||||
.c.@OBJEXT@:
|
.c.@OBJEXT@:
|
||||||
$(CC) $(CFLAGS) $(CPPFLAGS) -c #{src}
|
$(CC) $(CFLAGS) $(CPPFLAGS) -c #{copt}#{src}
|
||||||
"
|
"
|
||||||
else
|
else
|
||||||
mfile.print "
|
mfile.print "
|
||||||
{$(srcdir)}.c{}.@OBJEXT@:
|
{$(srcdir)}.c{}.@OBJEXT@:
|
||||||
$(CC) -I. -I$(<D) $(CFLAGS) $(CPPFLAGS) -c $(<:/=\\)
|
$(CC) -I. -I$(<D) $(CFLAGS) $(CPPFLAGS) -c #{copt}#{src}
|
||||||
.c.@OBJEXT@:
|
.c.@OBJEXT@:
|
||||||
$(CC) $(CFLAGS) $(CPPFLAGS) -c $(<:/=\\)
|
$(CC) $(CFLAGS) $(CPPFLAGS) -c #{copt}#{src}
|
||||||
|
|
||||||
{$(srcdir)}.cc{}.@OBJEXT@:
|
{$(srcdir)}.cc{}.@OBJEXT@:
|
||||||
$(CXX) -I. -I$(<D) $(CXXFLAGS) $(CPPFLAGS) -c $(<:/=\\)
|
$(CXX) -I. -I$(<D) $(CXXFLAGS) $(CPPFLAGS) -c #{cxxopt}#{src}
|
||||||
.cc.@OBJEXT@:
|
.cc.@OBJEXT@:
|
||||||
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(<:/=\\)
|
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c #{cxxopt}#{src}
|
||||||
{$(srcdir)}.cpp{}.@OBJEXT@:
|
{$(srcdir)}.cpp{}.@OBJEXT@:
|
||||||
$(CXX) -I. -I$(<D) $(CXXFLAGS) $(CPPFLAGS) -c $(<:/=\\)
|
$(CXX) -I. -I$(<D) $(CXXFLAGS) $(CPPFLAGS) -c #{cxxopt}#{src}
|
||||||
.cpp.@OBJEXT@:
|
.cpp.@OBJEXT@:
|
||||||
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(<:/=\\)
|
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c #{cxxopt}#{src}
|
||||||
{$(srcdir)}.cxx{}.@OBJEXT@:
|
{$(srcdir)}.cxx{}.@OBJEXT@:
|
||||||
$(CXX) -I. -I$(<D) $(CXXFLAGS) $(CPPFLAGS) -c $(<:/=\\)
|
$(CXX) -I. -I$(<D) $(CXXFLAGS) $(CPPFLAGS) -c #{cxxopt}#{src}
|
||||||
.cxx.@OBJEXT@:
|
.cxx.@OBJEXT@:
|
||||||
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(<:/=\\)
|
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c #{cxxopt}#{src}
|
||||||
"
|
"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -559,7 +569,7 @@ $(DLLIB): $(OBJS)
|
||||||
mfile.print "\tenv LIB='$(subst /,\\\\,$(LIBPATH));$(LIB)' \\\n"
|
mfile.print "\tenv LIB='$(subst /,\\\\,$(LIBPATH));$(LIB)' \\\n"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
mfile.print "\t$(LDSHARED) $(DLDFLAGS) -o $(DLLIB) $(OBJS) $(LIBS) $(LOCAL_LIBS)\n"
|
mfile.print "\t$(LDSHARED) $(DLDFLAGS) #{OUTFLAG}$(DLLIB) $(OBJS) $(LIBS) $(LOCAL_LIBS)\n"
|
||||||
elsif RUBY_PLATFORM == "m68k-human"
|
elsif RUBY_PLATFORM == "m68k-human"
|
||||||
mfile.printf "\
|
mfile.printf "\
|
||||||
$(DLLIB): $(OBJS)
|
$(DLLIB): $(OBJS)
|
||||||
|
|
77
lib/mkmf.rb
77
lib/mkmf.rb
|
@ -39,7 +39,12 @@ end
|
||||||
|
|
||||||
$log = open('mkmf.log', 'w')
|
$log = open('mkmf.log', 'w')
|
||||||
|
|
||||||
LINK = "#{CONFIG['CC']} -o conftest -I#{$hdrdir} #{CFLAGS} -I#{CONFIG['includedir']} %s %s #{CONFIG['LDFLAGS']} %s conftest.c %s %s #{CONFIG['LIBS']}"
|
if /mswin32/ =~ RUBY_PLATFORM
|
||||||
|
OUTFLAG = '-Fe'
|
||||||
|
else
|
||||||
|
OUTFLAG = '-o '
|
||||||
|
end
|
||||||
|
LINK = "#{CONFIG['CC']} #{OUTFLAG}conftest -I#{$hdrdir} #{CFLAGS} -I#{CONFIG['includedir']} %s %s #{CONFIG['LDFLAGS']} %s conftest.c %s %s #{CONFIG['LIBS']}"
|
||||||
CPP = "#{CONFIG['CPP']} -E %s -I#{$hdrdir} #{CFLAGS} -I#{CONFIG['includedir']} %s %s conftest.c"
|
CPP = "#{CONFIG['CPP']} -E %s -I#{$hdrdir} #{CFLAGS} -I#{CONFIG['includedir']} %s %s conftest.c"
|
||||||
|
|
||||||
def rm_f(*files)
|
def rm_f(*files)
|
||||||
|
@ -497,49 +502,49 @@ EOMF
|
||||||
install_rb(mfile, "$(sitelibdir)", srcdir)
|
install_rb(mfile, "$(sitelibdir)", srcdir)
|
||||||
mfile.printf "\n"
|
mfile.printf "\n"
|
||||||
|
|
||||||
if /mswin32/ !~ RUBY_PLATFORM
|
unless /mswin32/ =~ RUBY_PLATFORM
|
||||||
mfile.print "
|
src = '$<'
|
||||||
.c.#{$OBJEXT}:
|
copt = cxxopt = ''
|
||||||
$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
|
else
|
||||||
|
if /nmake/i =~ $make
|
||||||
|
src = '$(<:\\=/)'
|
||||||
|
else
|
||||||
|
src = '$(subst /,\\\\,$<)'
|
||||||
|
end
|
||||||
|
copt = '-Tc'
|
||||||
|
cxxopt = '-Tp'
|
||||||
|
end
|
||||||
|
unless /nmake/i =~ $make
|
||||||
|
mfile.puts "
|
||||||
.cc.#{$OBJEXT}:
|
.cc.#{$OBJEXT}:
|
||||||
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
|
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c #{cxxopt}#{src}
|
||||||
.cpp.#{$OBJEXT}:
|
.cpp.#{$OBJEXT}:
|
||||||
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
|
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c #{cxxopt}#{src}
|
||||||
.cxx.#{$OBJEXT}:
|
.cxx.#{$OBJEXT}:
|
||||||
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
|
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c #{cxxopt}#{src}
|
||||||
.C.#{$OBJEXT}:
|
.C.#{$OBJEXT}:
|
||||||
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
|
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c #{cxxopt}#{src}
|
||||||
"
|
|
||||||
elsif /nmake/i =~ $make
|
|
||||||
mfile.print "
|
|
||||||
{$(srcdir)}.c.#{$OBJEXT}:
|
|
||||||
$(CC) $(CFLAGS) -I$(<D) $(CPPFLAGS) -c $(<:/=\\)
|
|
||||||
.c.#{$OBJEXT}:
|
.c.#{$OBJEXT}:
|
||||||
$(CC) $(CFLAGS) -I$(<D) $(CPPFLAGS) -c $(<:/=\\)
|
$(CC) $(CFLAGS) $(CPPFLAGS) -c #{copt}#{src}
|
||||||
|
|
||||||
{$(srcdir)}.cc{}.#{$OBJEXT}:
|
|
||||||
$(CXX) -I. -I$(<D) $(CXXFLAGS) $(CPPFLAGS) -c $(<:/=\\)
|
|
||||||
.cc.#{$OBJEXT}:
|
|
||||||
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(<:/=\\)
|
|
||||||
{$(srcdir)}.cpp{}.#{$OBJEXT}:
|
|
||||||
$(CXX) -I. -I$(<D) $(CXXFLAGS) $(CPPFLAGS) -c $(<:/=\\)
|
|
||||||
.cpp.#{$OBJEXT}:
|
|
||||||
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(<:/=\\)
|
|
||||||
{$(srcdir)}.cxx{}.#{$OBJEXT}:
|
|
||||||
$(CXX) -I. -I$(<D) $(CXXFLAGS) $(CPPFLAGS) -c $(<:/=\\)
|
|
||||||
.cxx.#{$OBJEXT}:
|
|
||||||
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(<:/=\\)
|
|
||||||
"
|
"
|
||||||
else
|
else
|
||||||
mfile.print "
|
mfile.print "
|
||||||
.SUFFIXES: .#{$OBJEXT}
|
{$(srcdir)}.c{}.#{$OBJEXT}:
|
||||||
|
$(CC) -I. -I$(<D) $(CFLAGS) $(CPPFLAGS) -c #{copt}#{src}
|
||||||
.c.#{$OBJEXT}:
|
.c.#{$OBJEXT}:
|
||||||
$(CC) $(CFLAGS) $(CPPFLAGS) -c $(subst /,\\\\,$<)
|
$(CC) $(CFLAGS) $(CPPFLAGS) -c #{copt}#{src}
|
||||||
|
{$(srcdir)}.cc{}.#{$OBJEXT}:
|
||||||
.cc.#{$OBJEXT} .cpp.#{$OBJEXT} .cxx.#{$OBJEXT} .C.#{$OBJEXT}:
|
$(CXX) -I. -I$(<D) $(CXXFLAGS) $(CPPFLAGS) -c #{cxxopt}#{src}
|
||||||
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(subst /,\\\\,$<)
|
.cc.#{$OBJEXT}:
|
||||||
|
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c #{cxxopt}#{src}
|
||||||
|
{$(srcdir)}.cpp{}.#{$OBJEXT}:
|
||||||
|
$(CXX) -I. -I$(<D) $(CXXFLAGS) $(CPPFLAGS) -c #{cxxopt}#{src}
|
||||||
|
.cpp.#{$OBJEXT}:
|
||||||
|
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c #{cxxopt}#{src}
|
||||||
|
{$(srcdir)}.cxx{}.#{$OBJEXT}:
|
||||||
|
$(CXX) -I. -I$(<D) $(CXXFLAGS) $(CPPFLAGS) -c #{cxxopt}#{src}
|
||||||
|
.cxx.#{$OBJEXT}:
|
||||||
|
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c #{cxxopt}#{src}
|
||||||
"
|
"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -552,7 +557,7 @@ EOMF
|
||||||
mfile.print "\tenv LIB='$(subst /,\\\\,$(LIBPATH));$(LIB)' \\\n"
|
mfile.print "\tenv LIB='$(subst /,\\\\,$(LIBPATH));$(LIB)' \\\n"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
mfile.print "\t$(LDSHARED) $(DLDFLAGS) -o $(DLLIB) $(OBJS) $(LIBS) $(LOCAL_LIBS)\n"
|
mfile.print "\t$(LDSHARED) $(DLDFLAGS) #{OUTFLAG}$(DLLIB) $(OBJS) $(LIBS) $(LOCAL_LIBS)\n"
|
||||||
elsif not File.exist?(target + ".c") and not File.exist?(target + ".cc")
|
elsif not File.exist?(target + ".c") and not File.exist?(target + ".cc")
|
||||||
mfile.print "$(DLLIB): $(OBJS)\n"
|
mfile.print "$(DLLIB): $(OBJS)\n"
|
||||||
case RUBY_PLATFORM
|
case RUBY_PLATFORM
|
||||||
|
|
|
@ -18,6 +18,13 @@ RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME)w
|
||||||
!ifndef RUBY_SO_NAME
|
!ifndef RUBY_SO_NAME
|
||||||
RUBY_SO_NAME = rubymw
|
RUBY_SO_NAME = rubymw
|
||||||
!endif
|
!endif
|
||||||
|
!if !defined(icondirs) && defined(ICONDIRS)
|
||||||
|
icondirs=$(ICONDIRS)
|
||||||
|
!endif
|
||||||
|
!if defined(icondirs)
|
||||||
|
icondirs=$(icondirs:\=/)
|
||||||
|
iconinc=-I$(icondirs)
|
||||||
|
!endif
|
||||||
###############
|
###############
|
||||||
|
|
||||||
VPATH = $(srcdir):$(srcdir)/missing
|
VPATH = $(srcdir):$(srcdir)/missing
|
||||||
|
@ -31,7 +38,7 @@ AUTOCONF = autoconf
|
||||||
|
|
||||||
prefix = /usr
|
prefix = /usr
|
||||||
CFLAGS = -nologo -DNT=1 -Zi -MD -O2b2xg- -G5
|
CFLAGS = -nologo -DNT=1 -Zi -MD -O2b2xg- -G5
|
||||||
CPPFLAGS = -I$(srcdir) -I$(srcdir)/missing
|
CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/missing -DLIBRUBY_SO=\"$(LIBRUBY_SO)\"
|
||||||
LDFLAGS = $(CFLAGS) -Fm
|
LDFLAGS = $(CFLAGS) -Fm
|
||||||
XLDFLAGS =
|
XLDFLAGS =
|
||||||
#EXTLIBS =
|
#EXTLIBS =
|
||||||
|
@ -102,7 +109,7 @@ OBJS = array.obj \
|
||||||
|
|
||||||
all: miniruby$(EXEEXT) rbconfig.rb ext/extmk.rb \
|
all: miniruby$(EXEEXT) rbconfig.rb ext/extmk.rb \
|
||||||
$(LIBRUBY) $(MISCLIBS)
|
$(LIBRUBY) $(MISCLIBS)
|
||||||
set LIB=../..;$(ORGLIBPATH)
|
set LIB=..\..;$(ORGLIBPATH)
|
||||||
@.\miniruby$(EXEEXT) -Cext extmk.rb
|
@.\miniruby$(EXEEXT) -Cext extmk.rb
|
||||||
|
|
||||||
ruby: $(PROGRAM)
|
ruby: $(PROGRAM)
|
||||||
|
@ -110,6 +117,9 @@ rubyw: $(WPROGRAM)
|
||||||
lib: $(LIBRUBY)
|
lib: $(LIBRUBY)
|
||||||
dll: $(LIBRUBY_SO)
|
dll: $(LIBRUBY_SO)
|
||||||
|
|
||||||
|
config.h config.status: $(srcdir)/win32/$$@.in
|
||||||
|
@type $(srcdir:/=\)\win32\$@.in > $@
|
||||||
|
|
||||||
ext/extmk.rb: $(srcdir)/ext/extmk.rb.in config.status
|
ext/extmk.rb: $(srcdir)/ext/extmk.rb.in config.status
|
||||||
@echo Creating ext/extmk.rb
|
@echo Creating ext/extmk.rb
|
||||||
@.\miniruby$(EXEEXT) $(srcdir)/ext/configsub.rb \
|
@.\miniruby$(EXEEXT) $(srcdir)/ext/configsub.rb \
|
||||||
|
@ -121,15 +131,15 @@ ext/extmk.rb: $(srcdir)/ext/extmk.rb.in config.status
|
||||||
miniruby$(EXEEXT): $(OBJS) $(MAINOBJ) $(EXTOBJS)
|
miniruby$(EXEEXT): $(OBJS) $(MAINOBJ) $(EXTOBJS)
|
||||||
@echo $(EXTOBJS)
|
@echo $(EXTOBJS)
|
||||||
@echo $(LIBS)
|
@echo $(LIBS)
|
||||||
$(PURIFY) $(CC) $(LDFLAGS) $(MAINOBJ) $(EXTOBJS) $(OBJS) $(LIBS) -o $@
|
$(PURIFY) $(CC) $(LDFLAGS) $(MAINOBJ) $(EXTOBJS) $(OBJS) $(LIBS) -Fe$@
|
||||||
|
|
||||||
$(PROGRAM): $(MAINOBJ) $(LIBRUBY_SO) $*.res
|
$(PROGRAM): $(MAINOBJ) $(LIBRUBY_SO) $*.res
|
||||||
$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $*.res \
|
$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $*.res \
|
||||||
-o $@ $(LIBRUBYARG) -link /STACK:$(STACK)
|
-Fe$@ $(LIBRUBYARG) -link -stack:$(STACK) -incremental:no
|
||||||
|
|
||||||
$(WPROGRAM): $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $*.res
|
$(WPROGRAM): $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $*.res
|
||||||
$(PURIFY) $(CC) $(LDFLAGS) $(MAINOBJ) $(WINMAINOBJ) $*.res \
|
$(PURIFY) $(CC) $(LDFLAGS) $(MAINOBJ) $(WINMAINOBJ) $*.res \
|
||||||
-o $@ $(LIBRUBYARG) -link /STACK:$(STACK) /SUBSYSTEM:Windows
|
-Fe$@ $(LIBRUBYARG) -link -stack:$(STACK) -subsystem:Windows -incremental:no
|
||||||
|
|
||||||
$(LIBRUBY_A): $(OBJS) dmyext.obj
|
$(LIBRUBY_A): $(OBJS) dmyext.obj
|
||||||
lib -nologo /OUT:$@ $(OBJS) dmyext.obj
|
lib -nologo /OUT:$@ $(OBJS) dmyext.obj
|
||||||
|
@ -138,9 +148,9 @@ $(LIBRUBY): $(RUBYDEF)
|
||||||
lib -nologo /OUT:$@ /DEF:$(RUBYDEF)
|
lib -nologo /OUT:$@ /DEF:$(RUBYDEF)
|
||||||
|
|
||||||
$(LIBRUBY_SO): $(LIBRUBY_A) $(EXTOBJS) $(RUBYDEF) $@.res
|
$(LIBRUBY_SO): $(LIBRUBY_A) $(EXTOBJS) $(RUBYDEF) $@.res
|
||||||
set LIB=./win32;$(ORGLIBPATH)
|
set LIB=.\win32;$(ORGLIBPATH)
|
||||||
$(CC) $(LDFLAGS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBY_A) $@.res $(LIBS) \
|
$(CC) $(LDFLAGS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBY_A) $@.res $(LIBS) \
|
||||||
-o $@ -link /DLL /DEF:$(RUBYDEF)
|
-Fe$@ -link -dll -def:$(RUBYDEF)
|
||||||
|
|
||||||
!if "$(LIBRUBY_SO)" != "rubymw.dll"
|
!if "$(LIBRUBY_SO)" != "rubymw.dll"
|
||||||
rubymw.dll: $(LIBRUBY)
|
rubymw.dll: $(LIBRUBY)
|
||||||
|
@ -153,21 +163,50 @@ $(RUBYDEF): $(LIBRUBY_A) miniruby$(EXEEXT)
|
||||||
install: rbconfig.rb
|
install: rbconfig.rb
|
||||||
.\miniruby.exe $(srcdir)/instruby.rb $(DESTDIR)
|
.\miniruby.exe $(srcdir)/instruby.rb $(DESTDIR)
|
||||||
|
|
||||||
clean:; @rm -f $(OBJS) $(LIBRUBY_A) $(MAINOBJ) rbconfig.rb
|
clean:
|
||||||
@rm -f ext/extinit.c ext/extinit.obj ext/vc*.pdb *.obj *.res
|
@if exist $(LIBRUBY_A) del $(LIBRUBY_A)
|
||||||
|
@if exist $(MAINOBJ) del $(MAINOBJ)
|
||||||
|
@if exist rbconfig.rb del rbconfig.rb
|
||||||
|
@if exist ext\extinit.c del ext\extinit.c
|
||||||
|
@if exist ext\extinit.obj del ext\extinit.obj
|
||||||
|
@if exist ext\vc*.pdb del ext\vc*.pdb
|
||||||
|
@if exist *.obj del *.obj
|
||||||
|
@if exist *.res del *.res
|
||||||
@-.\miniruby$(EXEEXT) -Cext extmk.rb clean
|
@-.\miniruby$(EXEEXT) -Cext extmk.rb clean
|
||||||
|
|
||||||
distclean: clean
|
distclean: clean
|
||||||
@rm -f Makefile ext/extmk.rb config.h
|
@if exist Makefile del Makefile
|
||||||
@rm -f ext/config.cache config.cache config.log config.status
|
@if exist ext\extmk.rb del ext\extmk.rb
|
||||||
@rm -f *~ core *.core gmon.out y.tab.c y.output ruby.imp
|
@if exist config.h del config.h
|
||||||
@rm -f *.map *.pdb *.ilk *.exp $(RUBYDEF)
|
@if exist ext\config.cache del ext\config.cache
|
||||||
@rm -f $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(LIBRUBY_SO).rc
|
@if exist config.cache del config.cache
|
||||||
@rm -f $(PROGRAM) $(WPROGRAM) $(LIBRUBY_SO) $(LIBRUBY) miniruby$(EXEEXT)
|
@if exist config.log del config.log
|
||||||
|
@if exist config.status del config.status
|
||||||
|
@if exist *~ del *~
|
||||||
|
@if exist *.bak del *.bak
|
||||||
|
@if exist *.stackdump del *.stackdump
|
||||||
|
@if exist *.core del *.core
|
||||||
|
@if exist gmon.out del gmon.out
|
||||||
|
@if exist y.tab.c del y.tab.c
|
||||||
|
@if exist y.output del y.output
|
||||||
|
@if exist *.map del *.map
|
||||||
|
@if exist *.pdb del *.pdb
|
||||||
|
@if exist *.ilk del *.ilk
|
||||||
|
@if exist *.exp del *.exp
|
||||||
|
@if exist $(RUBYDEF) del $(RUBYDEF)
|
||||||
|
@if exist $(RUBY_INSTALL_NAME).rc del $(RUBY_INSTALL_NAME).rc
|
||||||
|
@if exist $(RUBYW_INSTALL_NAME).rc del $(RUBYW_INSTALL_NAME).rc
|
||||||
|
@if exist $(LIBRUBY_SO).rc del $(LIBRUBY_SO).rc
|
||||||
|
@if exist $(PROGRAM) del $(PROGRAM)
|
||||||
|
@if exist $(WPROGRAM) del $(WPROGRAM)
|
||||||
|
@if exist $(LIBRUBY_SO) del $(LIBRUBY_SO)
|
||||||
|
@if exist $(LIBRUBY) del $(LIBRUBY)
|
||||||
|
@if exist ext\nul if not exist ext\* rmdir ext
|
||||||
|
@if exist miniruby$(EXEEXT) del miniruby$(EXEEXT)
|
||||||
|
|
||||||
realclean: distclean
|
realclean: distclean
|
||||||
@rm -f parse.c
|
@if exist parse.c del parse.c
|
||||||
@rm -f lex.c
|
@if exist lex.c del lex.c
|
||||||
|
|
||||||
test: miniruby$(EXEEXT)
|
test: miniruby$(EXEEXT)
|
||||||
@.\miniruby$(EXEEXT) $(srcdir)/rubytest.rb
|
@.\miniruby$(EXEEXT) $(srcdir)/rubytest.rb
|
||||||
|
@ -188,16 +227,16 @@ $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(LIBRUBY_SO).rc: rbconfig.rb
|
||||||
# $(SHELL) ./config.status --recheck
|
# $(SHELL) ./config.status --recheck
|
||||||
|
|
||||||
{$(srcdir)/missing}.c.obj:
|
{$(srcdir)/missing}.c.obj:
|
||||||
$(CC) $(CFLAGS) -I. -I$(<D) $(CPPFLAGS) -c $(<:/=\)
|
$(CC) $(CFLAGS) -I. -I$(<D) $(CPPFLAGS) -c -Tc$(<:\=/)
|
||||||
{$(srcdir)/win32}.c.obj:
|
{$(srcdir)/win32}.c.obj:
|
||||||
$(CC) $(CFLAGS) -I. -I$(<D) $(CPPFLAGS) -c $(<:/=\)
|
$(CC) $(CFLAGS) -I. -I$(<D) $(CPPFLAGS) -c -Tc$(<:\=/)
|
||||||
{$(srcdir)}.c.obj:
|
{$(srcdir)}.c.obj:
|
||||||
$(CC) $(CFLAGS) -I. -I$(<D) $(CPPFLAGS) -c $(<:/=\)
|
$(CC) $(CFLAGS) -I. -I$(<D) $(CPPFLAGS) -c -Tc$(<:\=/)
|
||||||
.c.obj:
|
.c.obj:
|
||||||
$(CC) $(CFLAGS) -I. $(CPPFLAGS) -c $(<:/=\)
|
$(CC) $(CFLAGS) -I. $(CPPFLAGS) -c -Tc$(<:\=/)
|
||||||
|
|
||||||
.rc.res:
|
.rc.res:
|
||||||
$(RC) -I. -I$(<D) -I$(srcdir)/win32 $(RFLAGS) -fo$@ $<
|
$(RC) -I. -I$(<D) $(iconinc) -I$(srcdir)/win32 $(RFLAGS) -fo$@ $(<:\=/)
|
||||||
|
|
||||||
{$(srcdir)}.y.c:
|
{$(srcdir)}.y.c:
|
||||||
$(YACC) $(YFLAGS) $(<:\=/)
|
$(YACC) $(YFLAGS) $(<:\=/)
|
||||||
|
@ -278,3 +317,4 @@ time.obj: $(srcdir)/time.c $(srcdir)/ruby.h config.h $(srcdir)/defines.h $(srcdi
|
||||||
util.obj: $(srcdir)/util.c $(srcdir)/ruby.h config.h $(srcdir)/defines.h $(srcdir)/intern.h $(srcdir)/util.h
|
util.obj: $(srcdir)/util.c $(srcdir)/ruby.h config.h $(srcdir)/defines.h $(srcdir)/intern.h $(srcdir)/util.h
|
||||||
variable.obj: $(srcdir)/variable.c $(srcdir)/ruby.h config.h $(srcdir)/defines.h $(srcdir)/intern.h $(srcdir)/env.h $(srcdir)/node.h $(srcdir)/st.h
|
variable.obj: $(srcdir)/variable.c $(srcdir)/ruby.h config.h $(srcdir)/defines.h $(srcdir)/intern.h $(srcdir)/env.h $(srcdir)/node.h $(srcdir)/st.h
|
||||||
version.obj: $(srcdir)/version.c $(srcdir)/ruby.h config.h $(srcdir)/defines.h $(srcdir)/intern.h $(srcdir)/version.h
|
version.obj: $(srcdir)/version.c $(srcdir)/ruby.h config.h $(srcdir)/defines.h $(srcdir)/intern.h $(srcdir)/version.h
|
||||||
|
$(OBJS) $(MAINOBJ) $(WINMAINOBJ): $(srcdir)/win32/win32.h
|
||||||
|
|
|
@ -22,6 +22,6 @@ Makefile:
|
||||||
@echo !INCLUDE $$(srcdir)/win32/Makefile.sub>> $@
|
@echo !INCLUDE $$(srcdir)/win32/Makefile.sub>> $@
|
||||||
|
|
||||||
config.h config.status: $(srcdir)/win32/$$@.in
|
config.h config.status: $(srcdir)/win32/$$@.in
|
||||||
@copy $(srcdir:/=\)\win32\$@.in $@ > nul
|
@type $(srcdir:/=\)\win32\$@.in > $@
|
||||||
|
|
||||||
ext:; @if not exist $@\* mkdir $@
|
ext:; @if not exist $@\* mkdir $@
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue