pegasus/mak/platform_WIN32_IX86_MSVC.mak - diff

Return to platform_WIN32_IX86_MSVC.mak CVS log

Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/platform_WIN32_IX86_MSVC.mak between version 1.34 and 1.35

version 1.34, 2005/04/25 05:23:31

version 1.35, 2005/05/03 20:20:50

Line 21

# The flags set here should be valid for VC 6.

VERSION_FLAGS := -GX

CXX_VERSION_FLAGS := -GX

VERSION_DEBUG_FLAGS :=

CXX_VERSION_DEBUG_FLAGS :=

VERSION_RELEASE_FLAGS :=

CXX_VERSION_RELEASE_FLAGS :=

LINK_VERSION_RELEASE_FLAGS :=

# CL_MAJOR_VERSION 13 is VC 7

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

Line 40

Line 42

# CL_MAJOR_VERSION 14 is VC 8

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

endif

ifdef PEGASUS_DEBUG

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

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)

endif

Legend:

Removed from v.1.34
changed lines
	Added in v.1.35

No CVS admin address has been configured