diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | bcc32/Makefile.sub | 5 | ||||
-rw-r--r-- | bcc32/README.bcc32 | 12 | ||||
-rw-r--r-- | bcc32/setup.mak | 8 |
4 files changed, 31 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Thu Feb 23 15:36:25 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> + + * bcc32/Makefile.sub: use borlndmm.dll if possible. bcc32's RTL internal + memory manager cannot handle large memory block properly. + ex: 10000.times { "" << "." * 529671; GC.start } # crash + [ruby-dev:28230] + Thu Feb 23 13:23:03 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> * eval.c (SETUP_ARGS0): fixed memory corruption. [ruby-dev:28360] diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index cfcc8ac3b9..d0edd03da2 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -129,7 +129,10 @@ RFLAGS = $(iconinc) !ifndef EXTLIBS EXTLIBS = !endif -LIBS = cw32i.lib import32.lib ws2_32.lib $(EXTLIBS) +!ifndef MEMLIB +MEMLIB = +!endif +LIBS = $(MEMLIB) cw32i.lib import32.lib ws2_32.lib $(EXTLIBS) MISSING = acosh.obj crypt.obj erf.obj win32.obj !ifndef STACK diff --git a/bcc32/README.bcc32 b/bcc32/README.bcc32 index 9768a88233..fb19906c75 100644 --- a/bcc32/README.bcc32 +++ b/bcc32/README.bcc32 @@ -19,6 +19,14 @@ * bison ((<URL:http://gnuwin32.sourceforge.net/packages/bison.htm>)) * sed ((<URL:http://gnuwin32.sourceforge.net/packages/sed.htm>)) +(4) We strongly recommend to build ruby on C++Builder, to link following files. + * usebormm.lib + * memmgr.lib + + RTL's internal memory manager cannot handle large memory block properly, + so we should use borlndmm.dll instead. + 10000.times { "" << "." * 529671; GC.start } # crash + == How to compile and install (1) Execute bcc32\configure.bat on your build directory. @@ -53,6 +61,10 @@ If Ruby's version is `x.y.z', the ((|<MAJOR>|)) is `x' and the ((|<MINOR>|)) is `y'. The default ((|<PLATFORM>|)) is `(({i386-bccwin32}))'. +(6) Requires dynamic RTL (cc3250.dll on C++Builder5) and borlndmm.dll (If built with + usebormm.lib) to use installed binary. These files are ordinary in bcc32's bin + directory. + == Icons Any icon files(*.ico) in the build directory, directories specified with diff --git a/bcc32/setup.mak b/bcc32/setup.mak index dac52bf92b..8f73b4f9f7 100644 --- a/bcc32/setup.mak +++ b/bcc32/setup.mak @@ -54,6 +54,14 @@ EXTOUT = $(EXTOUT) $(BANG)endif !endif | + @type > usebormm.bat &&| +@echo off +ilink32 -Gn -x usebormm.lib > nul +if exist usebormm.tds echo MEMLIB = usebormm.lib +| + @usebormm.bat >> $(MAKEFILE) + @del usebormm.* + @cpp32 -I$(srcdir) -P- -DRUBY_EXTERN="//" -o$(MAKEFILE) > nul &&| \#include "version.h" MAJOR = RUBY_VERSION_MAJOR |