(file) Return to platform_WIN32_IX86_MSVC.mak CVS log (file) (dir) Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/platform_WIN32_IX86_MSVC.mak between version 1.53 and 1.53.2.3

version 1.53, 2008/12/16 18:55:36 version 1.53.2.3, 2009/05/25 07:36:44
Line 35 
Line 35 
  
 DEPEND_INCLUDES = DEPEND_INCLUDES =
  
 DEFINES = -DPEGASUS_PLATFORM_$(PEGASUS_PLATFORM) -D_WIN32_WINNT=0x0400  DEFINES = -DPEGASUS_PLATFORM_$(PEGASUS_PLATFORM) -D_WIN32_WINNT=0x0600
 #-D_WIN32_WINNT=0x0400 -DWINVER=0x0400 #-D_WIN32_WINNT=0x0400 -DWINVER=0x0400
  
  
Line 45 
Line 45 
 CL_VERSION := $(word 8, $(shell cl.exe 2>&1)) CL_VERSION := $(word 8, $(shell cl.exe 2>&1))
 CL_MAJOR_VERSION := $(word 1, $(subst .,  , $(CL_VERSION))) CL_MAJOR_VERSION := $(word 1, $(subst .,  , $(CL_VERSION)))
  
   VC_CL_VERSIONS := 14 15
   VC_CL_VERSION  := $(findstring $(CL_MAJOR_VERSION), $(VC_CL_VERSIONS))
  
 # #
 # Determine the version of Windows being used. # Determine the version of Windows being used.
Line 83 
Line 85 
  
  
 # #
 # CL_MAJOR_VERSION 14 is VC 8  # CL_MAJOR_VERSION 14 or 15 (i.e., VC 8 or VC 9)
 # #
 ifeq ($(CL_MAJOR_VERSION), 14)  ifeq ($(CL_MAJOR_VERSION), $(VC_CL_VERSION))
     CXX_VERSION_FLAGS := -Wp64 -EHsc      CXX_VERSION_FLAGS := -EHsc
     CXX_VERSION_DEBUG_FLAGS := -RTCc -RTCsu     CXX_VERSION_DEBUG_FLAGS := -RTCc -RTCsu
     CXX_VERSION_RELEASE_FLAGS := -GF -GL -Gy     CXX_VERSION_RELEASE_FLAGS := -GF -GL -Gy
     LINK_VERSION_RELEASE_FLAGS := /LTCG /OPT:REF /OPT:ICF=5 /OPT:NOWIN98     LINK_VERSION_RELEASE_FLAGS := /LTCG /OPT:REF /OPT:ICF=5 /OPT:NOWIN98

Legend:
Removed from v.1.53  
changed lines
  Added in v.1.53.2.3
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2