1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* {bcc32,win32,wince}/Makefile.sub: moved CPPFLAGS only for ruby

source to XCFLAGS.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8834 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2005-07-25 12:31:21 +00:00
parent a6df88f00b
commit 9b4ddc1a01
4 changed files with 8 additions and 12 deletions

View file

@ -1,4 +1,4 @@
Mon Jul 25 21:29:20 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Jul 25 21:30:46 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk: Borland MAKE doesn't look for file names which have paths * common.mk: Borland MAKE doesn't look for file names which have paths
from VPATH. fixed: [ruby-dev:26604] from VPATH. fixed: [ruby-dev:26604]
@ -7,6 +7,9 @@ Mon Jul 25 21:29:20 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* {win32,wince}/Makefile.sub: vsnprintf() is in missing now. * {win32,wince}/Makefile.sub: vsnprintf() is in missing now.
* {bcc32,win32,wince}/Makefile.sub: moved CPPFLAGS only for ruby
source to XCFLAGS.
Mon Jul 25 14:10:02 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> Mon Jul 25 14:10:02 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/multi-tk.rb: fix en-bugged part in the last commit. * ext/tk/lib/multi-tk.rb: fix en-bugged part in the last commit.

View file

@ -117,9 +117,6 @@ OUTFLAG = -o
!ifndef CFLAGS !ifndef CFLAGS
CFLAGS = -q -tWR -tWC $(DEBUGFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG) -w- -wsus -wcpt -wdup -wext -wrng -wrpt -wzdi CFLAGS = -q -tWR -tWC $(DEBUGFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG) -w- -wsus -wcpt -wdup -wext -wrng -wrpt -wzdi
!endif !endif
!ifndef CPPFLAGS
CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)missing
!endif
!ifndef CXXFLAGS !ifndef CXXFLAGS
CXXFLAGS = $(CFLAGS) CXXFLAGS = $(CFLAGS)
!endif !endif
@ -139,7 +136,7 @@ MISSING = acosh.obj crypt.obj erf.obj win32.obj
STACK = 0x2000000 STACK = 0x2000000
!endif !endif
XCFLAGS = -DRUBY_EXPORT XCFLAGS = -DRUBY_EXPORT -I. -I$(srcdir) -I$(srcdir)missing
ARFLAGS = /a ARFLAGS = /a
LD = ilink32 -q -Gn LD = ilink32 -q -Gn

View file

@ -116,9 +116,6 @@ OUTFLAG = -Fe
!if !defined(CFLAGS) !if !defined(CFLAGS)
CFLAGS = -MD $(DEBUGFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG) CFLAGS = -MD $(DEBUGFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG)
!endif !endif
!if !defined(CPPFLAGS)
CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/missing
!endif
!if !defined(CXXFLAGS) !if !defined(CXXFLAGS)
CXXFLAGS = $(CFLAGS) CXXFLAGS = $(CFLAGS)
!endif !endif
@ -141,7 +138,7 @@ ARFLAGS = -machine:$(MACHINE) -out:
CC = $(CC) -nologo CC = $(CC) -nologo
LD = $(CC) LD = $(CC)
LDSHARED = $(LD) -LD LDSHARED = $(LD) -LD
XCFLAGS = -DRUBY_EXPORT XCFLAGS = -DRUBY_EXPORT -I. -I$(srcdir) -I$(srcdir)/missing
DLDFLAGS = $(LDFLAGS) -dll DLDFLAGS = $(LDFLAGS) -dll
SOLIBS = SOLIBS =

View file

@ -109,8 +109,7 @@ OUTFLAG = -Fe
CFLAGS = $(DEBUGFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG) CFLAGS = $(DEBUGFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG)
!endif !endif
!if !defined(CPPFLAGS) !if !defined(CPPFLAGS)
CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/missing -I$(srcdir)/wince \ CPPFLAGS = $(CECPUDEF) -DUNDER_CE -D_WIN32_WCE=$(SUBSYSVERSION:.=) \
$(CECPUDEF) -DUNDER_CE -D_WIN32_WCE=$(SUBSYSVERSION:.=) \
-DFILENAME_MAX=MAX_PATH -DTLS_OUT_OF_INDEXES=0xFFFFFFFF \ -DFILENAME_MAX=MAX_PATH -DTLS_OUT_OF_INDEXES=0xFFFFFFFF \
-DBUFSIZ=512 -D_UNICODE -DUNICODE -DBUFSIZ=512 -D_UNICODE -DUNICODE
!endif !endif
@ -141,7 +140,7 @@ ARFLAGS = -machine:$(MACHINE) -out:
CC = $(CC) -nologo CC = $(CC) -nologo
LD = $(CC) LD = $(CC)
LDSHARED = $(LD) -LD LDSHARED = $(LD) -LD
XCFLAGS = -DRUBY_EXPORT XCFLAGS = -DRUBY_EXPORT -I. -I$(srcdir) -I$(srcdir)/missing -I$(srcdir)/wince
DLDFLAGS = $(LDFLAGS) -dll DLDFLAGS = $(LDFLAGS) -dll
SOLIBS = SOLIBS =