(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.2.1 and 1.50

version 1.41.2.1, 2006/06/28 21:26:59 version 1.50, 2008/09/11 05:30:05
Line 49 
Line 49 
  
  
 # #
   # 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.
 # #
 # 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 82 
Line 93 
     CXX_VERSION_RELEASE_FLAGS := -GF -GL -Gy     CXX_VERSION_RELEASE_FLAGS := -GF -GL -Gy
     LINK_VERSION_RELEASE_FLAGS := /LTCG /OPT:REF /OPT:ICF=5 /OPT:NOWIN98     LINK_VERSION_RELEASE_FLAGS := /LTCG /OPT:REF /OPT:ICF=5 /OPT:NOWIN98
     DEFINES += -D_CRT_SECURE_NO_DEPRECATE     DEFINES += -D_CRT_SECURE_NO_DEPRECATE
       DEFINES += -D_CRT_NONSTDC_NO_DEPRECATE
 endif endif
  
  
Line 90 
Line 102 
     LINK_FLAGS += -debug     LINK_FLAGS += -debug
 else else
     FLAGS = $(CXX_VERSION_FLAGS) $(CXX_VERSION_RELEASE_FLAGS) -GR -W3 -O2 -MD     FLAGS = $(CXX_VERSION_FLAGS) $(CXX_VERSION_RELEASE_FLAGS) -GR -W3 -O2 -MD
     LINK_FLAGS += $(LINK_VERSION_RELEASE_FLAGS)      LINK_FLAGS += $(LINK_VERSION_RELEASE_FLAGS) -map
 endif endif
  
  
Line 163 
Line 175 
  
 YACC = bison YACC = bison
  
   RC = rc
   
 # Windows DLLs are installed in the $(PEGASUS_HOME)/bin directory # Windows DLLs are installed in the $(PEGASUS_HOME)/bin directory
 PEGASUS_DEST_LIB_DIR = bin PEGASUS_DEST_LIB_DIR = bin
  
Line 172 
Line 186 
 # 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.41.2.1  
changed lines
  Added in v.1.50

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2