summaryrefslogtreecommitdiff
path: root/bcc32
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-04-19 22:28:28 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-04-19 22:28:28 +0000
commitddda8205c2a94a17fa3ad735f1dfd91b81f139ba (patch)
tree30b6f2e49ab36a08a0be5f6ef67b832eba750175 /bcc32
parentf9fb21448bc4c9b1d7e9fb135dc37593974a3498 (diff)
* {bcc32,win32,wince}/configure.bat, {bcc32,win32,wince}/setup.mak:
add extout option. * bcc32/setup.mak: make configuration variables overridable. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8358 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'bcc32')
-rw-r--r--bcc32/configure.bat6
-rw-r--r--bcc32/setup.mak33
2 files changed, 37 insertions, 2 deletions
diff --git a/bcc32/configure.bat b/bcc32/configure.bat
index d68fd19..123a3f2 100644
--- a/bcc32/configure.bat
+++ b/bcc32/configure.bat
@@ -20,6 +20,7 @@ if "%1" == "--program-suffix" goto :suffix
if "%1" == "--program-name" goto :progname
if "%1" == "--enable-install-doc" goto :enable-rdoc
if "%1" == "--disable-install-doc" goto :disable-rdoc
+if "%1" == "--extout" goto :extout
if "%1" == "-h" goto :help
if "%1" == "--help" goto :help
echo>> ~tmp~.mak "%1" \
@@ -67,6 +68,11 @@ goto :loop
echo>> ~tmp~.mak -D"RDOCTARGET=install-nodoc" \
shift
goto :loop
+:extout
+ echo>> ~tmp~.mak "EXTOUT=%2" \
+ shift
+ shift
+goto :loop
:help
echo Configuration:
echo --help display this help
diff --git a/bcc32/setup.mak b/bcc32/setup.mak
index 5d4a372..d6120d1 100644
--- a/bcc32/setup.mak
+++ b/bcc32/setup.mak
@@ -14,7 +14,7 @@ prefix = /usr
!endif
OS = bccwin32
RT = $(OS)
-INCLUDE = !include
+BANG = !
APPEND = echo>>$(MAKEFILE)
!ifdef MAKEFILE
MAKE = $(MAKE) -f $(MAKEFILE)
@@ -34,11 +34,24 @@ alpha-$(OS): -prologue- -alpha- -epilogue-
@echo Creating $(MAKEFILE)
@type > $(MAKEFILE) &&|
\#\#\# Makefile for ruby $(OS) \#\#\#
+$(BANG)ifndef srcdir
srcdir = $(srcdir:\=/)
+$(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
|
@cpp32 -I$(srcdir) -DRUBY_EXTERN="//" -P- -o$(MAKEFILE) > nul &&|
@@ -54,28 +67,44 @@ TEENY = RUBY_VERSION_TEENY
!if defined(PROCESSOR_ARCHITECTURE) || defined(PROCESSOR_LEVEL)
@type >> $(MAKEFILE) &&|
!if defined(PROCESSOR_ARCHITECTURE)
+$(BANG)ifndef PROCESSOR_ARCHITECTURE
PROCESSOR_ARCHITECTURE = $(PROCESSOR_ARCHITECTURE)
+$(BANG)endif
!endif
!if defined(PROCESSOR_LEVEL)
+$(BANG)ifndef PROCESSOR_LEVEL
PROCESSOR_LEVEL = $(PROCESSOR_LEVEL)
+$(BANG)endif
!endif
|
!endif
-alpha-: nul
+ @$(APPEND) !ifndef PROCESSOR_ARCHITECTURE
@$(APPEND) PROCESSOR_ARCHITECTURE = alpha
+ @$(APPEND) !endif
-ix86-: nul
+ @$(APPEND) !ifndef PROCESSOR_ARCHITECTURE
@$(APPEND) PROCESSOR_ARCHITECTURE = x86
+ @$(APPEND) !endif
-i386-: -ix86-
+ @$(APPEND) !ifndef PROCESSOR_LEVEL
@$(APPEND) PROCESSOR_LEVEL = 3
+ @$(APPEND) !endif
-i486-: -ix86-
+ @$(APPEND) !ifndef PROCESSOR_LEVEL
@$(APPEND) PROCESSOR_LEVEL = 4
+ @$(APPEND) !endif
-i586-: -ix86-
+ @$(APPEND) !ifndef PROCESSOR_LEVEL
@$(APPEND) PROCESSOR_LEVEL = 5
+ @$(APPEND) !endif
-i686-: -ix86-
+ @$(APPEND) !ifndef PROCESSOR_LEVEL
@$(APPEND) PROCESSOR_LEVEL = 6
+ @$(APPEND) !endif
-epilogue-: nul
@type >> $(MAKEFILE) &&|
@@ -90,7 +119,7 @@ PROCESSOR_LEVEL = $(PROCESSOR_LEVEL)
\# LDFLAGS = -S:$$(STACK)
\# RFLAGS = $$(iconinc)
\# EXTLIBS = cw32.lib import32.lib user32.lib kernel32.lib
-$(INCLUDE) $$(srcdir)bcc32/Makefile.sub
+$(BANG)include $$(srcdir)bcc32/Makefile.sub
|
@$(srcdir:/=\)\win32\rm.bat config.h config.status
@echo type "`$(MAKE)'" to make ruby for $(OS).