pegasus/mak/platform_WIN64_X86_64_MSVC.mak - diff

Return to platform_WIN64_X86_64_MSVC.mak CVS log

Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/platform_WIN64_X86_64_MSVC.mak between version 1.5.4.1 and 1.15

version 1.5.4.1, 2008/07/01 15:17:28

version 1.15, 2009/02/20 13:22:48

Line 1

#//%2006////////////////////////////////////////////////////////////////////////

#//%LICENSE////////////////////////////////////////////////////////////////

#//

#// 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

#// 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

#// Source License; you may not use this file except in compliance with the

#// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.

#// License.

#// EMC Corporation; VERITAS Software Corporation; The Open Group.

#// 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 = win64

ARCHITECTURE = X86X64

Line 37

Line 35

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

Line 47

Line 45

CL_VERSION := $(word 8, $(shell cl.exe 2>&1))

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.

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 := -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

DEFINES += -D_CRT_NONSTDC_NO_DEPRECATE

endif

CXX_VERSION_FLAGS := -Wp64 -EHsc

CXX_VERSION_FLAGS := -EHsc

CXX_VERSION_DEBUG_FLAGS := -RTCc -RTCsu

ifdef PEGASUS_USE_DEBUG_BUILD_OPTIONS

Legend:

Removed from v.1.5.4.1
changed lines
	Added in v.1.15

No CVS admin address has been configured