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

Diff for /pegasus/mak/platform_WIN64_IA64_MSVC.mak between version 1.17 and 1.19

version 1.17, 2012/02/28 14:06:48 version 1.19, 2012/03/27 07:04: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_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
     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
       #VC 2010 only setting as it dont recognize NOWIN98 OPT
       ifeq ($(CL_MAJOR_VERSION), 16)
           LINK_VERSION_RELEASE_FLAGS := /LTCG /OPT:REF /OPT:ICF=5
       else
     LINK_VERSION_RELEASE_FLAGS := /LTCG /OPT:REF /OPT:ICF=5 /OPT:NOWIN98     LINK_VERSION_RELEASE_FLAGS := /LTCG /OPT:REF /OPT:ICF=5 /OPT:NOWIN98
       endif
     DEFINES += -D_CRT_SECURE_NO_DEPRECATE     DEFINES += -D_CRT_SECURE_NO_DEPRECATE
     DEFINES += -D_CRT_NONSTDC_NO_DEPRECATE     DEFINES += -D_CRT_NONSTDC_NO_DEPRECATE
 endif endif


Legend:
Removed from v.1.17  
changed lines
  Added in v.1.19

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2