diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-09-10 08:24:11 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-09-10 08:24:11 +0000 |
| commit | a3faa7e2e27c74b8f412de3f4b7d7e7e2c4881b8 (patch) | |
| tree | 8cf237e2af220fcea8f6992a4880e9010e0620d1 /win32/setup.mak | |
| parent | b3a426e70a662184f587396e8fe2cd2544b24242 (diff) | |
* win32/Makefile.sub (miniruby): shouldn't link $(EXTOBJS).
* win32/Makefile.sub ($(LIBRUBY_A), $(LIBRUBY)): avoid lib.exe's
warning.
* win32/Makefile.sub: remove unnecessary rules.
* win32/configure.bat, win32/setup.mak, win32/README.win32: enable to
pass some arguments to configure.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2832 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/setup.mak')
| -rw-r--r-- | win32/setup.mak | 59 |
1 files changed, 43 insertions, 16 deletions
diff --git a/win32/setup.mak b/win32/setup.mak index d5694c5f6c..88c5822a37 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -9,23 +9,50 @@ srcdir = $(WIN32DIR)/.. !ENDIF OS = mswin32 RT = msvcrt +INCLUDE = !include +MAKEFILE = $(WIN32DIR)/setup.mak -all: ext +!if "$(target)" == "" all: Makefile -all:; @echo type `nmake' to make ruby for mswin32. + @echo type `$(MAKE)' to make ruby for $(OS). +!else +all: $(target) +!endif -Makefile: - @echo ### makefile for ruby $(OS) ###> $@ - @echo srcdir = $(srcdir:\=/)>> $@ - @echo RUBY_INSTALL_NAME = ruby>> $@ - @echo RUBY_SO_NAME = $(RT)-$$(RUBY_INSTALL_NAME)17>> $@ - @echo prefix = /usr>> $@ - @echo CFLAGS = -nologo -MD -DNT=1 $$(DEBUGFLAGS) $$(OPTFLAGS) $$(PROCESSOR_FLAG)>> $@ - @echo CPPFLAGS = -I. -I$$(srcdir) -I$$(srcdir)/missing -DLIBRUBY_SO=\"$$(LIBRUBY_SO)\">> $@ - @echo LDFLAGS = $$(CFLAGS) -Fm>> $@ - @echo XLDFLAGS = >> $@ - @echo RFLAGS = -r>> $@ - @echo EXTLIBS =>> $@ - @echo !INCLUDE $$(srcdir)/win32/Makefile.sub>> $@ +i386-$(OS): + @$(MAKE) -$(MAKEFLAGS) -f $(MAKEFILE) target= \ + PROCESSOR_ARCHITECTURE=x86 PROCESSOR_LEVEL=3 +i486-$(OS): + @$(MAKE) -$(MAKEFLAGS) -f $(MAKEFILE) target= \ + PROCESSOR_ARCHITECTURE=x86 PROCESSOR_LEVEL=4 +i586-$(OS): + @$(MAKE) -$(MAKEFLAGS) -f $(MAKEFILE) target= \ + PROCESSOR_ARCHITECTURE=x86 PROCESSOR_LEVEL=5 +i686-$(OS): + @$(MAKE) -$(MAKEFLAGS) -f $(MAKEFILE) target= \ + PROCESSOR_ARCHITECTURE=x86 PROCESSOR_LEVEL=6 +alpha-$(OS): + @$(MAKE) -$(MAKEFLAGS) -f $(MAKEFILE) target= \ + PROCESSOR_ARCHITECTURE=alpha PROCESSOR_LEVEL= -ext:; @if not exist $@\* mkdir $@ +Makefile: + @echo Creating <<$@ +### Makefile for ruby $(OS) ### +srcdir = $(srcdir:\=/) +!if defined(PROCESSOR_ARCHITECTURE) +PROCESSOR_ARCHITECTURE = $(PROCESSOR_ARCHITECTURE) +!endif +!if defined(PROCESSOR_LEVEL) +PROCESSOR_LEVEL = $(PROCESSOR_LEVEL) +!endif +RUBY_INSTALL_NAME = ruby +RUBY_SO_NAME = $(RT)-$$(RUBY_INSTALL_NAME)17 +prefix = /usr +CFLAGS = -nologo -MD -DNT=1 $$(DEBUGFLAGS) $$(OPTFLAGS) $$(PROCESSOR_FLAG) +CPPFLAGS = -I. -I$$(srcdir) -I$$(srcdir)/missing -DLIBRUBY_SO=\"$$(LIBRUBY_SO)\" +LDFLAGS = $$(CFLAGS) -Fm +XLDFLAGS = +RFLAGS = -r +EXTLIBS = +$(INCLUDE) $$(srcdir)/win32/Makefile.sub +<<KEEP |