(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.12.1 and 1.6

version 1.1.12.1, 2007/06/25 19:51:09 version 1.6, 2008/06/03 19:10:05
Line 51 
Line 51 
 # #
 # Determine the version of Windows being used. # Determine the version of Windows being used.
 # IPv6 is not supported on Windows 2000 (earliest Windows version supported # 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).  # 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).
 # #
 WIN_VERSION := $(shell ver)  
 ifeq ($(findstring [Version 5.0.,$(WIN_VERSION)),[Version 5.0.)  
     PEGASUS_ENABLE_IPV6 = false  
 endif  
 ifeq ($(CL_MAJOR_VERSION), 12) ifeq ($(CL_MAJOR_VERSION), 12)
     PEGASUS_ENABLE_IPV6 = false     PEGASUS_ENABLE_IPV6 = false
 endif endif
Line 186 
Line 183 
 # Windows does not support local domain sockets or the equivalent Bug 2147 # Windows does not support local domain sockets or the equivalent Bug 2147
 PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET=1 PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET=1
  
 # l10n  PEGASUS_JAVA_CLASSPATH_DELIMITER = ;
 ifdef PEGASUS_HAS_MESSAGES  
     DEFINES += -DPEGASUS_HAS_MESSAGES  
     ifdef ICU_ROOT  
         MSG_COMPILE = genrb  
         MSG_FLAGS =  
         MSG_SOURCE_EXT = .txt  
         MSG_COMPILE_EXT = .res  
         CNV_ROOT_CMD = cnv2rootbundle  
  
 ################################## ##################################
 ## ##
 ## ICU_NO_UPPERCASE_ROOT if set, specifies NOT to uppercase the root resource bundle,  ## Pegasus WMIMapper
 ## default is to uppercase the root resource bundle##  ##
 ################################## ##################################
  
 ifdef ICU_NO_UPPERCASE_ROOT  ifeq ($(PEGASUS_BUILD_WMIMAPPER),true)
     CNV_ROOT_FLAGS =    FLAGS += -DPEGASUS_WMIMAPPER
 else else
     CNV_ROOT_FLAGS = -u    ifdef PEGASUS_WMIMAPPER
       FLAGS += -DPEGASUS_WMIMAPPER
     endif
 endif endif
  
 ####################################  ##################################
 ## ##
 ##   ICU_ROOT_BUNDLE_LANG if set, specifies the language that the root resource bundle will be generated from  ## The newer compiler versions need neither MS Platform SDK installed nor MSSdk variable defined.
 ##   defaults to _en if not set.  if set, for any directory containing resource bundles,  
 ##   there must exist a file name: package(the value of ICU_ROOT_BUNDLE_LANG).txt or the make messages target will fail  
 ## ##
 ##   We have to use the full path library because the cl /Fe command in program-windows.mak does  ##################################
 ##   not take libpath as an argument (as far as I can tell)  ifeq ($(PEGASUS_BUILD_WMIMAPPER),true)
 ####################################    ifeq ($(CL_MAJOR_VERSION), 12)
       PEGASUS_WMIMAPPER_NEED_MSSDK=true
 ifdef ICU_ROOT_BUNDLE_LANG    endif
     MSG_ROOT_SOURCE = $(ICU_ROOT_BUNDLE_LANG)    ifeq ($(CL_MAJOR_VERSION), 13)
 else      PEGASUS_WMIMAPPER_NEED_MSSDK=true
     MSG_ROOT_SOURCE = _en    endif
     ifeq ($(PEGASUS_WMIMAPPER_NEED_MSSDK),true)
       ifndef MSSdk
         $(error MSSdk environment variable undefined)
 endif endif
         DEFINES += -DPEGASUS_HAS_ICU  
         EXTRA_LIBRARIES += $(ICU_INSTALL)/lib/icuuc.lib $(ICU_INSTALL)/lib/icuin.lib $(ICU_INSTALL)/lib/icudt.lib  
         SYS_INCLUDES += -I$(ICU_ROOT)/source/common -I$(ICU_ROOT)/source/i18n  
     endif     endif
 endif endif
   
 PEGASUS_JAVA_CLASSPATH_DELIMITER = ;  


Legend:
Removed from v.1.1.12.1  
changed lines
  Added in v.1.6

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2