(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.54 and 1.58

version 1.54, 2009/01/23 04:53:54 version 1.58, 2012/02/28 14:06:48
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
Line 115 
Line 117 
     PEGASUS_ENABLE_SLP = true     PEGASUS_ENABLE_SLP = true
 endif endif
  
 # ATTN KS 20020927 - Add flag to allow conditional testing of interoperability  
 # changes during interoperability tests.  
 ifdef PEGASUS_SNIA_INTEROP_TEST  
     DEFINES+= -DPEGASUS_SNIA_INTEROP_TEST  
 endif  
   
 RM = mu rm RM = mu rm
  
 RMDIRHIER = mu rmdirhier RMDIRHIER = mu rmdirhier


Legend:
Removed from v.1.54  
changed lines
  Added in v.1.58

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2