diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | win32/Makefile.sub | 6 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Tue Mar 10 20:07:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * win32/Makefile.sub (WARNFLAGS): uses -wd4996 instead of + CRTDEFFLAGS. cf. [ruby-core:22725] + Tue Mar 10 19:58:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * include/ruby/win32.h (strcasecmp, strncasecmp): use _ prefixed diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 94d0fe40e..de4eb7c80 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 = |