mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* win32/Makefile.sub: VC++8 support.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9772 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
cd5cd3c672
commit
dc94d09ad5
2 changed files with 15 additions and 3 deletions
|
@ -1,8 +1,10 @@
|
|||
Fri Dec 30 18:14:54 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
Fri Dec 30 18:22:42 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* gc.c (garbage_collect): mark objects refered from aborting threads.
|
||||
[ruby-dev:28190]
|
||||
|
||||
* win32/Makefile.sub: VC++8 support.
|
||||
|
||||
Fri Dec 30 15:17:35 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
|
||||
|
||||
* lib/generator.rb: (Generator#initialize) ensured to stop @loop_thread.
|
||||
|
|
|
@ -63,18 +63,20 @@ PROCESSOR_LEVEL = 5
|
|||
!if 6 < $(PROCESSOR_LEVEL)
|
||||
PROCESSOR_LEVEL = 6
|
||||
!endif
|
||||
!if $(MSC_VER) < 1400
|
||||
PROCESSOR_FLAG = -G$(PROCESSOR_LEVEL)
|
||||
!endif
|
||||
CPU = i$(PROCESSOR_LEVEL)86
|
||||
ARCH = i386
|
||||
!else
|
||||
CPU = $(PROCESSOR_ARCHITECTURE)
|
||||
ARCH = $(PROCESSOR_ARCHITECTURE)
|
||||
!endif
|
||||
!if !defined(DEBUGFLAGS)
|
||||
!if !defined(DEBUGFLAGS) && $(MSC_VER) < 1400
|
||||
DEBUGFLAGS = -Zi
|
||||
!endif
|
||||
!if !defined(OPTFLAGS)
|
||||
OPTFLAGS = -O2b2xg-
|
||||
OPTFLAGS = -O2b2xty-
|
||||
!endif
|
||||
!if !defined(OS)
|
||||
OS = mswin32
|
||||
|
@ -142,6 +144,11 @@ CC = $(CC) -nologo
|
|||
LD = $(CC)
|
||||
LDSHARED = $(LD) -LD
|
||||
XCFLAGS = -DRUBY_EXPORT -I. -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
|
||||
!endif
|
||||
|
||||
DLDFLAGS = $(LDFLAGS) -dll
|
||||
SOLIBS =
|
||||
|
||||
|
@ -201,6 +208,9 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub
|
|||
@copy config.h config.h.old > nul
|
||||
!endif
|
||||
@$(srcdir:/=\)\win32\ifchange.bat config.h <<
|
||||
#if _MSC_VER != $(MSC_VER)
|
||||
#error MSC version unmatch
|
||||
#endif
|
||||
#define STDC_HEADERS 1
|
||||
#define HAVE_SYS_TYPES_H 1
|
||||
#define HAVE_SYS_STAT_H 1
|
||||
|
|
Loading…
Reference in a new issue