* Makefile.in, win32/Makefile.sub (XCFLAGS): -I. is needed for *.inc.
* ext/extmk.rb (parse_args): add also topdir to mflags. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12504 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
7d8743d5c5
commit
c389b3bb63
@ -1,3 +1,9 @@
|
||||
Sun Jun 10 14:48:43 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* Makefile.in, win32/Makefile.sub (XCFLAGS): -I. is needed for *.inc.
|
||||
|
||||
* ext/extmk.rb (parse_args): add also topdir to mflags.
|
||||
|
||||
Sun Jun 10 13:47:36 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* test/ruby/test_beginendblock.rb (test_should_propagate_signaled):
|
||||
|
@ -38,7 +38,7 @@ VPATH = $(arch_hdrdir)/ruby:$(hdrdir)/ruby:$(srcdir):$(srcdir)/missing
|
||||
empty =
|
||||
OUTFLAG = @OUTFLAG@$(empty)
|
||||
CFLAGS = @CFLAGS@ @ARCH_FLAG@
|
||||
XCFLAGS = -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) @XCFLAGS@
|
||||
XCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) @XCFLAGS@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
|
||||
EXTLDFLAGS =
|
||||
|
@ -289,7 +289,7 @@ def parse_args()
|
||||
$extout = '$(topdir)/'+$extout
|
||||
RbConfig::CONFIG["extout"] = CONFIG["extout"] = $extout
|
||||
$extout_prefix = $extout ? "$(extout)$(target_prefix)/" : ""
|
||||
$mflags << "extout=#$extout" << "extout_prefix=#$extout_prefix"
|
||||
$mflags << "topdir=#$topdir" << "extout=#$extout" << "extout_prefix=#$extout_prefix"
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -151,7 +151,7 @@ ARFLAGS = -machine:$(MACHINE) -out:
|
||||
CC = $(CC) -nologo
|
||||
LD = $(CC)
|
||||
LDSHARED = $(LD) -LD
|
||||
XCFLAGS = -DRUBY_EXPORT -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) -I$(srcdir)/missing
|
||||
XCFLAGS = -DRUBY_EXPORT -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) -I$(srcdir)/missing
|
||||
!if $(MSC_VER) >= 1400
|
||||
# Prevents VC++ 2005 (cl ver 14) warnings
|
||||
CPPFLAGS = $(CPPFLAGS) -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
|
||||
|
Loading…
x
Reference in New Issue
Block a user