summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorpatthoyts <patthoyts@users.sourceforge.net>2007-10-31 00:05:53 (GMT)
committerpatthoyts <patthoyts@users.sourceforge.net>2007-10-31 00:05:53 (GMT)
commit9484ae1c4377c8645247fd5111fa156755e7ea22 (patch)
tree725411d7c5a0246b447ff0f328f6cdfd86acf997 /win
parent267146b4985c6b6dfedbfa2373ec57a92b6307e5 (diff)
downloadtk-9484ae1c4377c8645247fd5111fa156755e7ea22.zip
tk-9484ae1c4377c8645247fd5111fa156755e7ea22.tar.gz
tk-9484ae1c4377c8645247fd5111fa156755e7ea22.tar.bz2
Use -fp:strict with msvc8 as -fp:precise fails on amd64 builds. Fix
the two places in Tk that generate errors with msvc8 when using this flag.
Diffstat (limited to 'win')
-rw-r--r--win/rules.vc12
1 files changed, 1 insertions, 11 deletions
diff --git a/win/rules.vc b/win/rules.vc
index f010169..836aaff 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -11,7 +11,7 @@
# Copyright (c) 2003-2007 Patrick Thoyts
#
#------------------------------------------------------------------------------
-# RCS: @(#) $Id: rules.vc,v 1.18 2007/10/12 18:56:33 patthoyts Exp $
+# RCS: @(#) $Id: rules.vc,v 1.19 2007/10/31 00:05:53 patthoyts Exp $
#------------------------------------------------------------------------------
!ifndef _RULES_VC
@@ -106,19 +106,9 @@ OPTIMIZATIONS = $(OPTIMIZATIONS) -Oi
OPTIMIZATIONS = $(OPTIMIZATIONS) -Op
!endif
-# Tk doesnt seem to be able to use -fp:strict.
-!if "$(PROJECT)" != "tk"
!if [nmakehlp -c -fp:strict]
OPTIMIZATIONS = $(OPTIMIZATIONS) -fp:strict
!endif
-!else
-!if [nmakehlp -c -fp:precise]
-OPTIMIZATIONS = $(OPTIMIZATIONS) -fp:precise
-!endif
-!if [nmakehlp -c -fp:except]
-OPTIMIZATIONS = $(OPTIMIZATIONS) -fp:except
-!endif
-!endif
!if [nmakehlp -c -Gs]
OPTIMIZATIONS = $(OPTIMIZATIONS) -Gs