(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.41.10.2 and 1.44

version 1.41.10.2, 2006/06/12 18:21:40 version 1.44, 2007/07/06 17:46:32
Line 49 
Line 49 
  
  
 # #
   # Determine the version of Windows being used.
   # IPv6 is not supported on Windows 2000 (earliest Windows version supported
   # by Pegasus), nor by the VC 6 compiler (CL_MAJOR_VERSION is 12 for VC 6).
   #
   WIN_VERSION := $(shell ver)
   ifeq ($(findstring [Version 5.0.,$(WIN_VERSION)),[Version 5.0.)
       PEGASUS_ENABLE_IPV6 = false
   endif
   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.
 # #
 # The -Zm105 flag was added as part of bug 4418 to resolve this compile error: # The -Zm105 flag was added as part of bug 4418 to resolve this compile error:
Line 170 
Line 184 
 PEGASUS_DISABLE_PROV_USERCTXT=1 PEGASUS_DISABLE_PROV_USERCTXT=1
  
 # Windows does not support local domain sockets or the equivalent Bug 2147 # Windows does not support local domain sockets or the equivalent Bug 2147
 #  No longer needed : Bug 4011  PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET=1
 #PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET=0  
  
 # l10n # l10n
 ifdef PEGASUS_HAS_MESSAGES ifdef PEGASUS_HAS_MESSAGES
Line 215 
Line 228 
         SYS_INCLUDES += -I$(ICU_ROOT)/source/common -I$(ICU_ROOT)/source/i18n         SYS_INCLUDES += -I$(ICU_ROOT)/source/common -I$(ICU_ROOT)/source/i18n
     endif     endif
 endif endif
   
   PEGASUS_JAVA_CLASSPATH_DELIMITER = ;
   
   
   ##################################
   ##
   ## Pegasus WMIMapper
   ##
   ##################################
   
   ifeq ($(PEGASUS_BUILD_WMIMAPPER),true)
     FLAGS += -DPEGASUS_WMIMAPPER
   else
     ifdef PEGASUS_WMIMAPPER
       FLAGS += -DPEGASUS_WMIMAPPER
     endif
   endif
   
   ifeq ($(PEGASUS_BUILD_WMIMAPPER),true)
     ifndef MSSdk
       $(error MSSdk environment variable undefined)
     endif
   endif
   
   


Legend:
Removed from v.1.41.10.2  
changed lines
  Added in v.1.44

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2