(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.1 and 1.4

version 1.1, 2007/01/11 16:21:52 version 1.4, 2007/10/05 12:31:22
Line 47 
Line 47 
 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)))
  
   
   #
   # Determine the version of Windows being used.
   # IPv6 is not supported on Windows 2000 (earliest Windows version supported
   # by Pegasus), but we don't enforce that here.
   # IPv6 is not supported by the VC 6 compiler (CL_MAJOR_VERSION is 12 for VC 6).
   #
   ifeq ($(CL_MAJOR_VERSION), 12)
       PEGASUS_ENABLE_IPV6 = false
   endif
   
   
 # #
 # The flags set here should be valid for VC 6. # The flags set here should be valid for VC 6.
 # #
Line 215 
Line 227 
 endif endif
  
 PEGASUS_JAVA_CLASSPATH_DELIMITER = ; PEGASUS_JAVA_CLASSPATH_DELIMITER = ;
   
   ##################################
   ##
   ## Pegasus WMIMapper
   ##
   ##################################
   
   ifeq ($(PEGASUS_BUILD_WMIMAPPER),true)
     FLAGS += -DPEGASUS_WMIMAPPER
   else
     ifdef PEGASUS_WMIMAPPER
       FLAGS += -DPEGASUS_WMIMAPPER
     endif
   endif
   
   ##################################
   ##
   ## The newer compiler versions need neither MS Platform SDK installed nor MSSdk variable defined.
   ##
   ##################################
   ifeq ($(PEGASUS_BUILD_WMIMAPPER),true)
     ifeq ($(CL_MAJOR_VERSION), 12)
       PEGASUS_WMIMAPPER_NEED_MSSDK=true
     endif
     ifeq ($(CL_MAJOR_VERSION), 13)
       PEGASUS_WMIMAPPER_NEED_MSSDK=true
     endif
     ifeq ($(PEGASUS_WMIMAPPER_NEED_MSSDK),true)
       ifndef MSSdk
         $(error MSSdk environment variable undefined)
       endif
     endif
   endif


Legend:
Removed from v.1.1  
changed lines
  Added in v.1.4

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2