diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | bcc32/Makefile.sub | 5 | ||||
| -rw-r--r-- | win32/Makefile.sub | 5 | ||||
| -rw-r--r-- | wince/Makefile.sub | 5 |
4 files changed, 8 insertions, 12 deletions
@@ -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 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. + * {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> * ext/tk/lib/multi-tk.rb: fix en-bugged part in the last commit. diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index 1570c33c41..23faea9a3d 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -117,9 +117,6 @@ OUTFLAG = -o !ifndef CFLAGS CFLAGS = -q -tWR -tWC $(DEBUGFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG) -w- -wsus -wcpt -wdup -wext -wrng -wrpt -wzdi !endif -!ifndef CPPFLAGS -CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)missing -!endif !ifndef CXXFLAGS CXXFLAGS = $(CFLAGS) !endif @@ -139,7 +136,7 @@ MISSING = acosh.obj crypt.obj erf.obj win32.obj STACK = 0x2000000 !endif -XCFLAGS = -DRUBY_EXPORT +XCFLAGS = -DRUBY_EXPORT -I. -I$(srcdir) -I$(srcdir)missing ARFLAGS = /a LD = ilink32 -q -Gn diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 3cef63ee66..385ac01522 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -116,9 +116,6 @@ OUTFLAG = -Fe !if !defined(CFLAGS) CFLAGS = -MD $(DEBUGFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG) !endif -!if !defined(CPPFLAGS) -CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/missing -!endif !if !defined(CXXFLAGS) CXXFLAGS = $(CFLAGS) !endif @@ -141,7 +138,7 @@ ARFLAGS = -machine:$(MACHINE) -out: CC = $(CC) -nologo LD = $(CC) LDSHARED = $(LD) -LD -XCFLAGS = -DRUBY_EXPORT +XCFLAGS = -DRUBY_EXPORT -I. -I$(srcdir) -I$(srcdir)/missing DLDFLAGS = $(LDFLAGS) -dll SOLIBS = diff --git a/wince/Makefile.sub b/wince/Makefile.sub index dc5ec293ba..609d45d4a1 100644 --- a/wince/Makefile.sub +++ b/wince/Makefile.sub @@ -109,8 +109,7 @@ OUTFLAG = -Fe CFLAGS = $(DEBUGFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG) !endif !if !defined(CPPFLAGS) -CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/missing -I$(srcdir)/wince \ - $(CECPUDEF) -DUNDER_CE -D_WIN32_WCE=$(SUBSYSVERSION:.=) \ +CPPFLAGS = $(CECPUDEF) -DUNDER_CE -D_WIN32_WCE=$(SUBSYSVERSION:.=) \ -DFILENAME_MAX=MAX_PATH -DTLS_OUT_OF_INDEXES=0xFFFFFFFF \ -DBUFSIZ=512 -D_UNICODE -DUNICODE !endif @@ -141,7 +140,7 @@ ARFLAGS = -machine:$(MACHINE) -out: CC = $(CC) -nologo LD = $(CC) LDSHARED = $(LD) -LD -XCFLAGS = -DRUBY_EXPORT +XCFLAGS = -DRUBY_EXPORT -I. -I$(srcdir) -I$(srcdir)/missing -I$(srcdir)/wince DLDFLAGS = $(LDFLAGS) -dll SOLIBS = |