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

Diff for /pegasus/mak/platform_WIN64_X86_64_MSVC.mak between version 1.11.2.3 and 1.12

version 1.11.2.3, 2009/05/25 07:36:44 version 1.12, 2009/01/23 04:53:54
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 85 
Line 83 
  
  
 # #
 # CL_MAJOR_VERSION 14 or 15 (i.e., VC 8 or VC 9)  # CL_MAJOR_VERSION 14 is VC 8
 # #
 ifeq ($(CL_MAJOR_VERSION), $(VC_CL_VERSION))  ifeq ($(CL_MAJOR_VERSION), 14)
     CXX_VERSION_FLAGS := -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
Line 96 
Line 94 
     DEFINES += -D_CRT_NONSTDC_NO_DEPRECATE     DEFINES += -D_CRT_NONSTDC_NO_DEPRECATE
 endif endif
  
     CXX_VERSION_FLAGS := -EHsc      CXX_VERSION_FLAGS := -Wp64 -EHsc
     CXX_VERSION_DEBUG_FLAGS := -RTCc -RTCsu     CXX_VERSION_DEBUG_FLAGS := -RTCc -RTCsu
  
 ifdef PEGASUS_USE_DEBUG_BUILD_OPTIONS ifdef PEGASUS_USE_DEBUG_BUILD_OPTIONS

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