(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.3 and 1.60

version 1.3, 2001/04/29 18:36:16 version 1.60, 2012/03/27 07:04:53
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 7 
Line 35 
  
 DEPEND_INCLUDES = DEPEND_INCLUDES =
  
 DEFINES = -DPEGASUS_PLATFORM_$(PEGASUS_PLATFORM)  DEFINES = -DPEGASUS_PLATFORM_$(PEGASUS_PLATFORM) -D_WIN32_WINNT=0x0600
   #-D_WIN32_WINNT=0x0400 -DWINVER=0x0400
  
 ifdef PEGASUS_DEBUG  
   FLAGS = -GX -W3 -Od -Zi -MDd  #
   # 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)))
   
   VC_CL_VERSIONS := 14 15 16
   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 -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, 15 or 16 (i.e., VC 8, VC 9 or VC 2010)
   #
   ifeq ($(CL_MAJOR_VERSION), $(VC_CL_VERSION))
       CXX_VERSION_FLAGS := -EHsc
       CXX_VERSION_DEBUG_FLAGS := -RTCc -RTCsu
       CXX_VERSION_RELEASE_FLAGS := -GF -GL -Gy
       # VC 2010 only setting as it dont take /OPT:NOWIN98 anymore
       ifeq ($(CL_MAJOR_VERSION), 16)
           LINK_VERSION_RELEASE_FLAGS := /LTCG /OPT:REF /OPT:ICF=5
 else else
   FLAGS = -GX -W3 -O2 -MD          LINK_VERSION_RELEASE_FLAGS := /LTCG /OPT:REF /OPT:ICF=5 /OPT:NOWIN98
       endif
       DEFINES += -D_CRT_SECURE_NO_DEPRECATE
       DEFINES += -D_CRT_NONSTDC_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
       FLAGS = $(CXX_VERSION_FLAGS) $(CXX_VERSION_RELEASE_FLAGS) -GR -W3 -O2 -MD
       LINK_FLAGS += $(LINK_VERSION_RELEASE_FLAGS) -map
   endif
   
   
   ifdef PEGASUS_DEBUG_CIMEXCEPTION
       DEFINES += -DPEGASUS_DEBUG_CIMEXCEPTION
   endif
   
   # if PEGASUS_ENABLE_SLP is already set then honor the users preference else
   # Enable the compilation of the SLP functions.
   #
   ifndef PEGASUS_ENABLE_SLP
       PEGASUS_ENABLE_SLP = true
 endif endif
  
 RM = mu rm RM = mu rm
Line 21 
Line 128 
  
 MKDIRHIER = mu mkdirhier MKDIRHIER = mu mkdirhier
  
   DIFF = mu compare
   
   SORT = mu sort
   
 COPY = mu copy COPY = mu copy
  
   MOVE = mu move
   
 CXX = cl -nologo CXX = cl -nologo
  
 EXE_OUT = -Fe EXE_OUT = -Fe
Line 35 
Line 148 
  
 EXE = .exe EXE = .exe
  
   DLL = .dll
   
   ILK = .ilk
   
   PDB = .pdb
   
   EXP = .exp
   
 AR = LINK -nologo -dll AR = LINK -nologo -dll
  
 LIB_PREFIX = LIB_PREFIX =
  
 LIB_SUFFIX = .lib LIB_SUFFIX = .lib
  
 COPY = mu copy  
   
 TOUCH = mu touch TOUCH = mu touch
  
 ECHO = mu echo ECHO = mu echo
Line 51 
Line 170 
  
 YACC = bison YACC = bison
  
 SYS_LIBS = ws2_32.lib advapi32.lib  
   
 SH = bash SH = bash
   
   YACC = bison
   
   RC = rc
   
   # Windows DLLs are installed in the $(PEGASUS_HOME)/bin directory
   PEGASUS_DEST_LIB_DIR = bin
   
   # The Provider User Context feature (PEP 197) is not supported on Windows
   PEGASUS_DISABLE_PROV_USERCTXT=1
   
   # Windows does not support local domain sockets or the equivalent Bug 2147
   PEGASUS_DISABLE_LOCAL_DOMAIN_SOCKET=1
   
   PEGASUS_JAVA_CLASSPATH_DELIMITER = ;
   
   
   ##################################
   ##
   ## Pegasus WMIMapper
   ##
   ##################################
   
   ifeq ($(PEGASUS_BUILD_WMIMAPPER),true)
     FLAGS += -DPEGASUS_WMIMAPPER
   else
     ifdef PEGASUS_WMIMAPPER
       FLAGS += -DPEGASUS_WMIMAPPER
     endif
   endif
   
   ##################################
   ##
   ## The newer compiler versions need neither MS Platform SDK installed nor MSSdk variable defined.
   ##
   ##################################
   ifeq ($(PEGASUS_BUILD_WMIMAPPER),true)
     ifeq ($(CL_MAJOR_VERSION), 12)
       PEGASUS_WMIMAPPER_NEED_MSSDK=true
     endif
     ifeq ($(CL_MAJOR_VERSION), 13)
       PEGASUS_WMIMAPPER_NEED_MSSDK=true
     endif
     ifeq ($(PEGASUS_WMIMAPPER_NEED_MSSDK),true)
       ifndef MSSdk
         $(error MSSdk environment variable undefined)
       endif
     endif
   endif
   
   
   
   

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