(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.15 and 1.17

version 1.15, 2009/02/20 13:22:48 version 1.17, 2012/02/29 10:06:12
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_VERSIONS := 14 15 16
 VC_CL_VERSION  := $(findstring $(CL_MAJOR_VERSION), $(VC_CL_VERSIONS)) VC_CL_VERSION  := $(findstring $(CL_MAJOR_VERSION), $(VC_CL_VERSIONS))
  
 # #
Line 85 
Line 85 
  
  
 # #
 # CL_MAJOR_VERSION 14 or 15 (i.e., VC 8 or VC 9)  # CL_MAJOR_VERSION 14, 15 or 16 (i.e., VC 8, VC 9 or VC 2010)
 # #
 ifeq ($(CL_MAJOR_VERSION), $(VC_CL_VERSION)) ifeq ($(CL_MAJOR_VERSION), $(VC_CL_VERSION))
     CXX_VERSION_FLAGS := -EHsc     CXX_VERSION_FLAGS := -EHsc
Line 119 
Line 119 
     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.15  
changed lines
  Added in v.1.17

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2