diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-10 11:07:42 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-10 11:07:42 +0000 |
| commit | c26d21bf71dc2aef9de9f92d0aba2f098df85986 (patch) | |
| tree | c001936b12349d4af7cc81e8ed3d8bb94de2a9cf /win32 | |
| parent | 0641a4d83e6580bf98a09cef4073b541e0bb4929 (diff) | |
* win32/Makefile.sub (WARNFLAGS): uses -wd4996 instead of
CRTDEFFLAGS. cf. [ruby-core:22725]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22877 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 94d0fe40eb..de4eb7c802 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -158,6 +158,9 @@ RUNTIMEFLAG = -MD !if !defined(COMPILERFLAG) COMPILERFLAG = -Zm600 !endif +!if !defined(WARNFLAGS) +WARNFLAGS = -W2 -wd4996 +!endif !if !defined(CFLAGS) CFLAGS = $(RUNTIMEFLAG) $(DEBUGFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG) $(COMPILERFLAG) !endif @@ -193,13 +196,12 @@ LDSHARED = $(LD) -LD XCFLAGS = -DRUBY_EXPORT -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) -I$(srcdir)/missing $(XCFLAGS) !if $(MSC_VER) >= 1400 # Prevents VC++ 2005 (cl ver 14) warnings -CRTDEFFLAGS = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE MANIFESTTOOL = mt -nologo LDSHARED_0 = @$(MINIRUBY) -run -e wait_writable -- -n 10 $@ LDSHARED_1 = $(MANIFESTTOOL) -manifest $(@).manifest -outputresource:$(@);2 LDSHARED_2 = @$(RM) $(@:/=\).manifest !endif -CPPFLAGS = $(CRTDEFFLAGS) $(DEFS) $(ARCHDEFS) $(CPPFLAGS) +CPPFLAGS = $(DEFS) $(ARCHDEFS) $(CPPFLAGS) DLDFLAGS = $(LDFLAGS) -dll SOLIBS = |