diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-07-21 08:32:34 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-07-21 08:32:34 +0000 |
commit | 92cad4305b1751fcea0bcfe1386e8f8cba265167 (patch) | |
tree | c148fe0f5950da61563e314ea509781c5a630c32 /bcc32/setup.mak | |
parent | 021660e4428f941553ae0cf893d756f270771471 (diff) |
* bcc32/{Makefile.sub,configure.bat,setup.mak: configure_args
support.
* bcc32/setup.mak: check runtime version.
* win32/win32.c (rb_w32_open_osfhandle): prototype has changed
in bcc 5.82.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12831 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'bcc32/setup.mak')
-rw-r--r-- | bcc32/setup.mak | 85 |
1 files changed, 55 insertions, 30 deletions
diff --git a/bcc32/setup.mak b/bcc32/setup.mak index 9af0ac2d7a..483292ed51 100644 --- a/bcc32/setup.mak +++ b/bcc32/setup.mak @@ -9,7 +9,7 @@ srcdir = $(bcc32dir:/bcc32/=) !else srcdir = $(bcc32dir)/.. !endif -!if "$(prefix)" == "" +!ifndef prefix prefix = /usr !endif OS = bccwin32 @@ -30,7 +30,9 @@ i586-$(OS): -prologue- -i586- -epilogue- i686-$(OS): -prologue- -i686- -epilogue- alpha-$(OS): -prologue- -alpha- -epilogue- --prologue-: nul +-prologue-: -basic-vars- -version- -system-vars- + +-basic-vars-: nul @echo Creating $(MAKEFILE) @type > $(MAKEFILE) &&| \#\#\# Makefile for ruby $(OS) \#\#\# @@ -40,41 +42,68 @@ $(BANG)endif $(BANG)ifndef prefix prefix = $(prefix:\=/) $(BANG)endif -$(BANG)ifndef EXTSTATIC -EXTSTATIC = $(EXTSTATIC) -$(BANG)endif -!if defined(RDOCTARGET) -$(BANG)ifndef RDOCTARGET -RDOCTARGET = $(RDOCTARGET) -$(BANG)endif -!endif -!if defined(EXTOUT) -$(BANG)ifndef EXTOUT -EXTOUT = $(EXTOUT) -$(BANG)endif -!endif -!if defined(BASERUBY) -$(BANG)ifndef BASERUBY -BASERUBY = $(BASERUBY) -$(BANG)endif +| +!if exist(confargs.mk) + @type confargs.mk >> $(MAKEFILE) + @del confargs.mk !endif + +-system-vars-: -runtime- -bormm- + +-bormm-: nul + @-ilink32 -q -Gn -x usebormm.lib > nul + @-if exist usebormm.tds $(APPEND) MEMLIB = usebormm.lib + @if exist usebormm.* del usebormm.* + +-osname-: nul + @echo OS = >>$(MAKEFILE) + +-runtime-: nul + type > conftest.c &&| +\#include <stdio.h> +int main(){printf("");return 0;} | - @type > usebormm.bat &&| -@echo off -ilink32 -Gn -x usebormm.lib > nul -if exist usebormm.tds echo MEMLIB = usebormm.lib + bcc32 conftest.c cw32i.lib > nul + tdump conftest.exe < nul > conftest.i + grep "^Imports from CC" conftest.i > conftest.c + cpp32 -P- -DFile=\# -DImports=RTNAME -Dfrom== conftest.c > nul + $(MAKE) > nul -DBANG=$(BANG) -f &&| +-runtime-: nul +$(BANG)include conftest.i +RT = $$(RTNAME:.DLL=) +OS = $$(RT:CC32=) +-runtime-: + del conftest.* +$(BANG)if "$$(OS)" == "50" + echo OS = bccwin32 >> $(MAKEFILE) +$(BANG)else + echo OS = bccwin32_$$(OS) >> $(MAKEFILE) +$(BANG)endif | - @usebormm.bat >> $(MAKEFILE) - @del usebormm.* + @echo RT = $$(OS) >> $(MAKEFILE) +-version-: nul @cpp32 -I$(srcdir) -P- -o$(MAKEFILE) > nul &&| \#include "version.h" MAJOR = RUBY_VERSION_MAJOR MINOR = RUBY_VERSION_MINOR TEENY = RUBY_VERSION_TEENY + +BORLANDC = __BORLANDC__ | - @type $(MAKEFILE).i >> $(MAKEFILE) + @$(MAKE) > nul -DBANG=$(BANG) -f &&, +-version-: nul +$(BANG)include $(MAKEFILE) +$(BANG)include $(MAKEFILE).i +-version-: @del $(MAKEFILE).i + @type >> $(MAKEFILE) &&| +MAJOR = $$(MAJOR) +MINOR = $$(MINOR) +TEENY = $$(TEENY) +BORLANDC = $$(BORLANDC) +| +, -generic-: nul !if defined(PROCESSOR_ARCHITECTURE) || defined(PROCESSOR_LEVEL) @@ -89,7 +118,6 @@ $(BANG)ifndef PROCESSOR_LEVEL PROCESSOR_LEVEL = $(PROCESSOR_LEVEL) $(BANG)endif !endif - | !endif @@ -122,8 +150,6 @@ $(BANG)endif -epilogue-: nul @type >> $(MAKEFILE) &&| -\# OS = $(OS) -\# RT = $(RT) \# RUBY_INSTALL_NAME = ruby \# RUBY_SO_NAME = $$(RT)-$$(RUBY_INSTALL_NAME)$$(MAJOR)$$(MINOR) \# CFLAGS = -q $$(DEBUGFLAGS) $$(OPTFLAGS) $$(PROCESSOR_FLAG) -w- -wsus -wcpt -wdup -wext -wrng -wrpt -wzdi @@ -134,5 +160,4 @@ $(BANG)endif \# EXTLIBS = cw32.lib import32.lib user32.lib kernel32.lib $(BANG)include $$(srcdir)/bcc32/Makefile.sub | - @$(srcdir:/=\)\win32\rm.bat config.h config.status @echo type "`$(MAKE)'" to make ruby for $(OS). |