(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.35 and 1.42

version 1.35, 2005/05/03 20:20:50 version 1.42, 2006/06/27 21:20:37
Line 1 
Line 1 
   #//%2006////////////////////////////////////////////////////////////////////////
   #//
   #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
   #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
   #// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;
   #// IBM Corp.; EMC Corporation, The Open Group.
   #// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;
   #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
   #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   #// 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
   #// of this software and associated documentation files (the "Software"), to
   #// deal in the Software without restriction, including without limitation the
   #// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
   #// sell copies of the Software, and to permit persons to whom the Software is
   #// furnished to do so, subject to the following conditions:
   #//
   #// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN
   #// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED
   #// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
   #// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
   #// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
   #// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
   #// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
   #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   #//
   #//==============================================================================
 OS_TYPE = windows OS_TYPE = windows
 OS = win32 OS = win32
 ARCHITECTURE = iX86 ARCHITECTURE = iX86
Line 21 
Line 51 
 # #
 # 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 50 
Line 85 
 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 63 
Line 98 
     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.
 ifdef PEGASUS_ENABLE_SLP  #
     DEFINES+= -DPEGASUS_ENABLE_SLP  ifndef PEGASUS_ENABLE_SLP
       PEGASUS_ENABLE_SLP = true
 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 177 
Line 214 
         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.35  
changed lines
  Added in v.1.42

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2