(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.34 and 1.52

version 1.34, 2005/04/25 05:23:31 version 1.52, 2008/12/02 09:00:01
Line 1 
Line 1 
   #//%LICENSE////////////////////////////////////////////////////////////////
   #//
   #// Licensed to The Open Group (TOG) under one or more contributor license
   #// agreements.  Refer to the OpenPegasusNOTICE.txt file distributed with
   #// this work for additional information regarding copyright ownership.
   #// Each contributor licenses this file to you under the OpenPegasus Open
   #// Source License; you may not use this file except in compliance with the
   #// License.
   #//
   #// 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 19 
Line 47 
  
  
 # #
   # 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.
 # #
 VERSION_FLAGS := -GX  # The -Zm105 flag was added as part of bug 4418 to resolve this compile error:
 VERSION_DEBUG_FLAGS :=  #   C:\Program Files\Microsoft Visual Studio\VC98\include\xlocale(467) :
 VERSION_RELEASE_FLAGS :=  #   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 # CL_MAJOR_VERSION 13 is VC 7
 # #
 ifeq ($(CL_MAJOR_VERSION), 13) ifeq ($(CL_MAJOR_VERSION), 13)
     VERSION_FLAGS := -Wp64 -EHsc      CXX_VERSION_FLAGS := -Wp64 -EHsc
     VERSION_DEBUG_FLAGS := -Gs      CXX_VERSION_DEBUG_FLAGS := -Gs
     VERSION_RELEASE_FLAGS := -Gs -GF      CXX_VERSION_RELEASE_FLAGS := -Gs -GF -Gy
       LINK_VERSION_RELEASE_FLAGS := /LTCG /OPT:REF /OPT:ICF=5 /OPT:NOWIN98
 endif endif
  
  
Line 40 
Line 86 
 # CL_MAJOR_VERSION 14 is VC 8 # CL_MAJOR_VERSION 14 is VC 8
 # #
 ifeq ($(CL_MAJOR_VERSION), 14) ifeq ($(CL_MAJOR_VERSION), 14)
     VERSION_FLAGS := -Wp64 -EHsc      CXX_VERSION_FLAGS := -Wp64 -EHsc
     VERSION_DEBUG_FLAGS := -RTCc -RTCsu      CXX_VERSION_DEBUG_FLAGS := -RTCc -RTCsu
     VERSION_RELEASE_FLAGS := -GF -GL      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     DEFINES += -D_CRT_SECURE_NO_DEPRECATE
       DEFINES += -D_CRT_NONSTDC_NO_DEPRECATE
 endif endif
  
  
 ifdef PEGASUS_DEBUG  ifdef PEGASUS_USE_DEBUG_BUILD_OPTIONS
     FLAGS = $(VERSION_FLAGS) $(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
     FLAGS = $(VERSION_FLAGS) $(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) -map
 endif endif
  
  
Line 59 
Line 108 
     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 122 
Line 173 
  
 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 131 
Line 184 
 # 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 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.34  
changed lines
  Added in v.1.52

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2