1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* bcc32/setup.mak : Control of a message.

Browse Source 
* bcc32/makefile.sub : include resource.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2859 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
H_Konishi 2002-09-12 14:27:02 +00:00
parent 66d9f5498b
commit df3368c1dd
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Thu Sep 12 23:20:10 2002 KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
* bcc32/setup.mak : Control of a message.
* bcc32/makefile.sub : include resource.
Thu Sep 12 18:10:03 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* dir.c (glob_helper): fixed freeing buffer. (ruby-bugs-ja:PR#332)

27
bcc32/Makefile.sub
View File

@ -38,7 +38,7 @@ VPATH = $(srcdir):$(srcdir)/missing
CC = bcc32
!endif
!ifndef RC
RC = brc32
RC = brcc32
!endif
!ifndef YACC
YACC = byacc
@ -99,10 +99,11 @@ MISSING = acosh.obj crypt.obj win32.obj
STACK = 0x2000000
!endif
LDSHARED = $(CC) -lS:$(STACK)
LINK = $(LDSHARED) -WC
LINK_W = $(LDSHARED) -W
LINK_SO = $(LDSHARED) -WD
LDSHARED = ilink32.exe -S:$(STACK)
LINK = $(LDSHARED) -Tpe C0X32.OBJ
LINK_W = $(LDSHARED) -Tpe C0W32.OBJ
LINK_SO = $(LDSHARED) -Tpd C0D32.OBJ
LDOBJECTS = CW32.LIB IMPORT32.LIB $(MAINOBJ)
DLDFLAGS =
SOLIBS =
@ -357,13 +358,13 @@ s,@top_srcdir@,$(srcdir),;t t
miniruby$(EXEEXT): $(OBJS) $(MAINOBJ) $(EXTOBJS)
@echo $(EXTOBJS)
@echo $(LIBS)
$(LINK) -e$@ $(MAINOBJ) $(EXTOBJS) $(OBJS) $(LIBS)
$(LINK) $(LDOBJECTS) $(EXTOBJS) $(OBJS) $(LIBS),$@
$(PROGRAM): $(MAINOBJ) $(LIBRUBY_SO) $(*:.exe=.res)
$(LINK) -e$@ $(MAINOBJ) $(LIBRUBYARG)
$(PROGRAM): $(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res
$(LINK) $(LDOBJECTS),$@,,$(LIBRUBYARG),,$(RUBY_INSTALL_NAME).res
$(WPROGRAM): $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $(*:.exe=.res)
$(LINK_W) -e$@ $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBYARG)
$(WPROGRAM): $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $(RUBYW_INSTALL_NAME).res
$(LINK_W) $(LDOBJECTS) $(WINMAINOBJ),$@,,$(LIBRUBYARG),,$(RUBYW_INSTALL_NAME).res
$(LIBRUBY_A): $(OBJS) dmyext.obj
@-if exist $@ del $@
@ -374,8 +375,9 @@ $(OBJS) dmyext.obj
$(LIBRUBY): $(LIBRUBY_SO)
implib $@ $(LIBRUBY_SO)
$(LIBRUBY_SO): $(LIBRUBY_A) $(EXTOBJS) $(RUBYDEF) $(*:.dll=.res)
$(LINK_SO) -e$@ $(MAINOBJ) $(EXTOBJS) $(LIBRUBY_A) $(LIBS)
$(LIBRUBY_SO): $(LIBRUBY_A) $(EXTOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
$(LINK_SO) $(LDOBJECTS) $(EXTOBJS) $(LIBS),$@,,$(LIBRUBY_A),$(RUBYDEF), $(RUBY_SO_NAME).res
$(RUBYDEF): $(LIBRUBY_A) miniruby$(EXEEXT)
.\miniruby$(EXEEXT) $(srcdir)bcc32/mkexports.rb -output=$@ $(LIBRUBY_A)
@ -395,6 +397,7 @@ clean-local:
@if exist *.obj del *.obj
@if exist *.res del *.res
@if exist *.tds del *.tds
@if exist *.il? del *.il?
clean-ext:
@-.\miniruby$(EXEEXT) $(srcdir)ext/extmk.rb clean

2
bcc32/setup.mak
View File

@ -11,7 +11,6 @@ srcdir = $(bcc32dir)../
OS = bccwin32
all: ext makefile
@echo type `make' to make ruby for bccwin32.
makefile: make_s make_e
@ -24,6 +23,7 @@ make_s:
make_e:
@echo !INCLUDE $$(srcdir)bcc32/makefile.sub>> makefile
@echo type `make' to make ruby for bccwin32.
ext:
@if not exist $@\* mkdir $@