(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.37 and 1.42.22.2

version 1.37, 2005/08/09 18:34:32 version 1.42.22.2, 2007/07/14 23:48:21
Line 1 
Line 1 
 #//%2005////////////////////////////////////////////////////////////////////////  #//%2006////////////////////////////////////////////////////////////////////////
 #// #//
 #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
 #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
Line 8 
Line 8 
 #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
 #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
 #// EMC Corporation; VERITAS Software Corporation; The Open Group. #// EMC Corporation; VERITAS Software Corporation; The Open Group.
   #// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   #// EMC Corporation; Symantec Corporation; The Open Group.
 #// #//
 #// Permission is hereby granted, free of charge, to any person obtaining a copy #// Permission is hereby granted, free of charge, to any person obtaining a copy
 #// of this software and associated documentation files (the "Software"), to #// of this software and associated documentation files (the "Software"), to
Line 47 
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.
 # #
 CXX_VERSION_FLAGS := -GX  # The -Zm105 flag was added as part of bug 4418 to resolve this compile error:
   #   C:\Program Files\Microsoft Visual Studio\VC98\include\xlocale(467) :
   #   fatal error C1076: compiler limit : internal heap limit reached; use /Zm to
   #   specify a higher limit
   #
   CXX_VERSION_FLAGS := -GX -Zm105
 CXX_VERSION_DEBUG_FLAGS := CXX_VERSION_DEBUG_FLAGS :=
 CXX_VERSION_RELEASE_FLAGS := CXX_VERSION_RELEASE_FLAGS :=
 LINK_VERSION_RELEASE_FLAGS := LINK_VERSION_RELEASE_FLAGS :=
Line 78 
Line 96 
 endif endif
  
  
 ifdef PEGASUS_DEBUG  ifdef PEGASUS_USE_DEBUG_BUILD_OPTIONS
     FLAGS = $(CXX_VERSION_FLAGS) $(CXX_VERSION_DEBUG_FLAGS) -GR -W3 -Od -Zi -MDd -DDEBUG -Fd$(OBJ_DIR)/     FLAGS = $(CXX_VERSION_FLAGS) $(CXX_VERSION_DEBUG_FLAGS) -GR -W3 -Od -Zi -MDd -DDEBUG -Fd$(OBJ_DIR)/
     LINK_FLAGS += -debug     LINK_FLAGS += -debug
 else else
Line 91 
Line 109 
     DEFINES += -DPEGASUS_DEBUG_CIMEXCEPTION     DEFINES += -DPEGASUS_DEBUG_CIMEXCEPTION
 endif endif
  
   # if PEGASUS_ENABLE_SLP is already set then honor the users preference else
 # Enable the compilation of the SLP functions. # Enable the compilation of the SLP functions.
 ifndef PEGASUS_DISABLE_SLP  #
   ifndef PEGASUS_ENABLE_SLP
     PEGASUS_ENABLE_SLP = true     PEGASUS_ENABLE_SLP = true
     DEFINES += -DPEGASUS_ENABLE_SLP  
 endif endif
  
 # ATTN KS 20020927 - Add flag to allow conditional testing of interoperability # ATTN KS 20020927 - Add flag to allow conditional testing of interoperability
Line 206 
Line 225 
         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 = ;

Legend:
Removed from v.1.37  
changed lines
  Added in v.1.42.22.2
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2