(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.25 and 1.40

version 1.25, 2005/03/08 01:56:29 version 1.40, 2005/12/16 19:44:35
Line 1 
Line 1 
   #//%2005////////////////////////////////////////////////////////////////////////
   #//
   #// 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.
   #//
   #// 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 10 
Line 38 
 DEFINES = -DPEGASUS_PLATFORM_$(PEGASUS_PLATFORM) -D_WIN32_WINNT=0x0400 DEFINES = -DPEGASUS_PLATFORM_$(PEGASUS_PLATFORM) -D_WIN32_WINNT=0x0400
 #-D_WIN32_WINNT=0x0400 -DWINVER=0x0400 #-D_WIN32_WINNT=0x0400 -DWINVER=0x0400
  
 ifdef PEGASUS_DEBUG  
   FLAGS = -GX -GR -W3 -Od -Zi -MDd -DDEBUG -Fd$(OBJ_DIR)/  #
   LINK_FLAGS = -debug  # Determine the version of the compiler being used.
   #
   CL_VERSION := $(word 8, $(shell cl.exe 2>&1))
   CL_MAJOR_VERSION := $(word 1, $(subst .,  , $(CL_VERSION)))
   
   
   #
   # 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:
   #   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_RELEASE_FLAGS :=
   LINK_VERSION_RELEASE_FLAGS :=
   
   
   #
   # CL_MAJOR_VERSION 13 is VC 7
   #
   ifeq ($(CL_MAJOR_VERSION), 13)
       CXX_VERSION_FLAGS := -Wp64 -EHsc
       CXX_VERSION_DEBUG_FLAGS := -Gs
       CXX_VERSION_RELEASE_FLAGS := -Gs -GF -Gy
       LINK_VERSION_RELEASE_FLAGS := /LTCG /OPT:REF /OPT:ICF=5 /OPT:NOWIN98
   endif
   
   
   #
   # CL_MAJOR_VERSION 14 is VC 8
   #
   ifeq ($(CL_MAJOR_VERSION), 14)
       CXX_VERSION_FLAGS := -Wp64 -EHsc
       CXX_VERSION_DEBUG_FLAGS := -RTCc -RTCsu
       CXX_VERSION_RELEASE_FLAGS := -GF -GL -Gy
       LINK_VERSION_RELEASE_FLAGS := /LTCG /OPT:REF /OPT:ICF=5 /OPT:NOWIN98
       DEFINES += -D_CRT_SECURE_NO_DEPRECATE
   endif
   
   
   ifdef PEGASUS_USE_DEBUG_BUILD_OPTIONS
       FLAGS = $(CXX_VERSION_FLAGS) $(CXX_VERSION_DEBUG_FLAGS) -GR -W3 -Od -Zi -MDd -DDEBUG -Fd$(OBJ_DIR)/
       LINK_FLAGS += -debug
 else else
   FLAGS = -GX -GR -W3 -O2 -MD      FLAGS = $(CXX_VERSION_FLAGS) $(CXX_VERSION_RELEASE_FLAGS) -GR -W3 -O2 -MD
       LINK_FLAGS += $(LINK_VERSION_RELEASE_FLAGS)
 endif endif
  
   
 ifdef PEGASUS_DEBUG_CIMEXCEPTION ifdef PEGASUS_DEBUG_CIMEXCEPTION
  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_ENABLE_SLP
 PEGASUS_ENABLE_SLP=true PEGASUS_ENABLE_SLP=true
   endif
  
 # ATTN KS 20020927 - Add flag to allow conditional testing of interoperability # ATTN KS 20020927 - Add flag to allow conditional testing of interoperability
 # changes during interoperability tests. # changes during interoperability tests.
Line 36 
Line 115 
  
 MKDIRHIER = mu mkdirhier MKDIRHIER = mu mkdirhier
  
   DIFF = mu compare
   
   SORT = mu sort
   
 COPY = mu copy COPY = mu copy
  
 MOVE = mu move MOVE = mu move
Line 84 
Line 167 
 # The Provider User Context feature (PEP 197) is not supported on Windows # The Provider User Context feature (PEP 197) is not supported on Windows
 PEGASUS_DISABLE_PROV_USERCTXT=1 PEGASUS_DISABLE_PROV_USERCTXT=1
  
   # Windows does not support local domain sockets or the equivalent Bug 2147
   PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET=1
   
 # l10n # l10n
 ifdef PEGASUS_HAS_MESSAGES ifdef PEGASUS_HAS_MESSAGES
   DEFINES += -DPEGASUS_HAS_MESSAGES   DEFINES += -DPEGASUS_HAS_MESSAGES
Line 126 
Line 212 
     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
   

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