(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.10.2 and 1.53.2.3

version 1.41.10.2, 2006/06/12 18:21:40 version 1.53.2.3, 2009/05/25 07:36:44
Line 1 
Line 1 
 #//%2006////////////////////////////////////////////////////////////////////////  #//%LICENSE////////////////////////////////////////////////////////////////
 #// #//
 #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development  #// Licensed to The Open Group (TOG) under one or more contributor license
 #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.  #// agreements.  Refer to the OpenPegasusNOTICE.txt file distributed with
 #// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;  #// this work for additional information regarding copyright ownership.
 #// IBM Corp.; EMC Corporation, The Open Group.  #// Each contributor licenses this file to you under the OpenPegasus Open
 #// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;  #// Source License; you may not use this file except in compliance with the
 #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.  #// License.
 #// 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  #// Permission is hereby granted, free of charge, to any person obtaining a
 #// of this software and associated documentation files (the "Software"), to  #// copy of this software and associated documentation files (the "Software"),
 #// deal in the Software without restriction, including without limitation the  #// to deal in the Software without restriction, including without limitation
 #// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or  #// the rights to use, copy, modify, merge, publish, distribute, sublicense,
 #// sell copies of the Software, and to permit persons to whom the Software is  #// and/or sell copies of the Software, and to permit persons to whom the
 #// furnished to do so, subject to the following conditions:  #// Software is furnished to do so, subject to the following conditions:
 #// #//
 #// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN  #// The above copyright notice and this permission notice shall be included
 #// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED  #// in all copies or substantial portions of the Software.
 #// "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.  
 #// #//
 #//==============================================================================  #// 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 37 
Line 35 
  
 DEPEND_INCLUDES = DEPEND_INCLUDES =
  
 DEFINES = -DPEGASUS_PLATFORM_$(PEGASUS_PLATFORM) -D_WIN32_WINNT=0x0400  DEFINES = -DPEGASUS_PLATFORM_$(PEGASUS_PLATFORM) -D_WIN32_WINNT=0x0600
 #-D_WIN32_WINNT=0x0400 -DWINVER=0x0400 #-D_WIN32_WINNT=0x0400 -DWINVER=0x0400
  
  
Line 47 
Line 45 
 CL_VERSION := $(word 8, $(shell cl.exe 2>&1)) CL_VERSION := $(word 8, $(shell cl.exe 2>&1))
 CL_MAJOR_VERSION := $(word 1, $(subst .,  , $(CL_VERSION))) CL_MAJOR_VERSION := $(word 1, $(subst .,  , $(CL_VERSION)))
  
   VC_CL_VERSIONS := 14 15
   VC_CL_VERSION  := $(findstring $(CL_MAJOR_VERSION), $(VC_CL_VERSIONS))
   
   #
   # 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.
Line 74 
Line 85 
  
  
 # #
 # CL_MAJOR_VERSION 14 is VC 8  # CL_MAJOR_VERSION 14 or 15 (i.e., VC 8 or VC 9)
 # #
 ifeq ($(CL_MAJOR_VERSION), 14)  ifeq ($(CL_MAJOR_VERSION), $(VC_CL_VERSION))
     CXX_VERSION_FLAGS := -Wp64 -EHsc      CXX_VERSION_FLAGS := -EHsc
     CXX_VERSION_DEBUG_FLAGS := -RTCc -RTCsu     CXX_VERSION_DEBUG_FLAGS := -RTCc -RTCsu
     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 170 
Line 184 
 PEGASUS_DISABLE_PROV_USERCTXT=1 PEGASUS_DISABLE_PROV_USERCTXT=1
  
 # Windows does not support local domain sockets or the equivalent Bug 2147 # Windows does not support local domain sockets or the equivalent Bug 2147
 #  No longer needed : Bug 4011  PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET=1
 #PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET=0  
   PEGASUS_JAVA_CLASSPATH_DELIMITER = ;
  
 # l10n  
 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 endif
         DEFINES += -DPEGASUS_HAS_ICU    ifeq ($(PEGASUS_WMIMAPPER_NEED_MSSDK),true)
         EXTRA_LIBRARIES += $(ICU_INSTALL)/lib/icuuc.lib $(ICU_INSTALL)/lib/icuin.lib $(ICU_INSTALL)/lib/icudt.lib      ifndef MSSdk
         SYS_INCLUDES += -I$(ICU_ROOT)/source/common -I$(ICU_ROOT)/source/i18n        $(error MSSdk environment variable undefined)
     endif     endif
 endif endif
   endif
   
   
   
   

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