summaryrefslogtreecommitdiffstats
path: root/mak
diff options
context:
space:
mode:
authordavid.dillard <david.dillard>2005-05-03 20:20:50 +0000
committerdavid.dillard <david.dillard>2005-05-03 20:20:50 +0000
commite4cd740aa8bc439e3001f8f4bde1e56e95064bb3 (patch)
tree7b6e2dd20809b07a9c1e4c6583c70e9817829a7d /mak
parent94feef997ae8d50b639caafadc55c10e38c494f3 (diff)
downloadtog-pegasus-e4cd740aa8bc439e3001f8f4bde1e56e95064bb3.zip
tog-pegasus-e4cd740aa8bc439e3001f8f4bde1e56e95064bb3.tar.gz
tog-pegasus-e4cd740aa8bc439e3001f8f4bde1e56e95064bb3.tar.xz
BUG#: 3056
TITLE: Updated Windows compiler options. DESCRIPTION: Mostly for release mode for VC 7 and VC 8. Added link flags which are needed to fully take advantage of the updated compiler flags.
Diffstat (limited to 'mak')
-rw-r--r--mak/platform_WIN32_IX86_MSVC.mak28
1 files changed, 16 insertions, 12 deletions
diff --git a/mak/platform_WIN32_IX86_MSVC.mak b/mak/platform_WIN32_IX86_MSVC.mak
index 1b117a8..1cbea7e 100644
--- a/mak/platform_WIN32_IX86_MSVC.mak
+++ b/mak/platform_WIN32_IX86_MSVC.mak
@@ -21,18 +21,20 @@ CL_MAJOR_VERSION := $(word 1, $(subst ., , $(CL_VERSION)))
#
# The flags set here should be valid for VC 6.
#
-VERSION_FLAGS := -GX
-VERSION_DEBUG_FLAGS :=
-VERSION_RELEASE_FLAGS :=
+CXX_VERSION_FLAGS := -GX
+CXX_VERSION_DEBUG_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
- VERSION_DEBUG_FLAGS := -Gs
- VERSION_RELEASE_FLAGS := -Gs -GF
+ 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
@@ -40,18 +42,20 @@ endif
# CL_MAJOR_VERSION 14 is VC 8
#
ifeq ($(CL_MAJOR_VERSION), 14)
- VERSION_FLAGS := -Wp64 -EHsc
- VERSION_DEBUG_FLAGS := -RTCc -RTCsu
- VERSION_RELEASE_FLAGS := -GF -GL
+ CXX_VERSION_FLAGS := -Wp64 -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
endif
ifdef PEGASUS_DEBUG
- FLAGS = $(VERSION_FLAGS) $(VERSION_DEBUG_FLAGS) -GR -W3 -Od -Zi -MDd -DDEBUG -Fd$(OBJ_DIR)/
- LINK_FLAGS := -debug
+ FLAGS = $(CXX_VERSION_FLAGS) $(CXX_VERSION_DEBUG_FLAGS) -GR -W3 -Od -Zi -MDd -DDEBUG -Fd$(OBJ_DIR)/
+ 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