(file) Return to platform_WIN64_X86_64_MSVC.mak CVS log (file) (dir) Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/platform_WIN64_X86_64_MSVC.mak between version 1.5 and 1.11

version 1.5, 2008/05/22 17:43:53 version 1.11, 2008/12/16 18:55:36
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 = win64 OS = win64
 ARCHITECTURE = X86X64 ARCHITECTURE = X86X64
Line 93 
Line 91 
     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
  
     CXX_VERSION_FLAGS := -Wp64 -EHsc     CXX_VERSION_FLAGS := -Wp64 -EHsc
Line 103 
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 174 
Line 173 
  
 SH = bash SH = bash
  
   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 183 
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
  
 ifdef PEGASUS_HAS_MESSAGES  
     ifneq ($(PEGASUS_HAS_ICU),true)  
         MSG_COMPILE = genrb  
         MSG_FLAGS =  
         MSG_SOURCE_EXT = .txt  
         MSG_COMPILE_EXT = .res  
         CNV_ROOT_CMD = cnv2rootbundle  
   
         EXTRA_LIBRARIES += $(ICU_INSTALL)/lib/icuuc.lib $(ICU_INSTALL)/lib/icuin.lib $(ICU_INSTALL)/lib/icudt.lib  
         SYS_INCLUDES += -I$(ICU_INSTALL)/include  
     endif  
 endif  
   
 PEGASUS_JAVA_CLASSPATH_DELIMITER = ; PEGASUS_JAVA_CLASSPATH_DELIMITER = ;
  
 ################################## ##################################


Legend:
Removed from v.1.5  
changed lines
  Added in v.1.11

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2