summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorhobbs <hobbs>2004-12-30 02:01:04 (GMT)
committerhobbs <hobbs>2004-12-30 02:01:04 (GMT)
commit1051226a08fdb0eef19a9768cf53b7c66a54804b (patch)
tree9590cf68367d108208be2cc3bb7d51a84346d983 /win
parent25782ab32acefa7b8fcff47b6adfb3ff6510820e (diff)
downloadtcl-1051226a08fdb0eef19a9768cf53b7c66a54804b.zip
tcl-1051226a08fdb0eef19a9768cf53b7c66a54804b.tar.gz
tcl-1051226a08fdb0eef19a9768cf53b7c66a54804b.tar.bz2
* win/tcl.m4, win/configure: update MSVC CFLAGS_OPT to -O2, remove
-Gs (included in -O2) and -GD (outdated). Use "link -lib" instead of "lib" binary and remove -YX for MSVC7 portability. Add -fomit-frame-pointer for gcc OPT compiles. [Bug 1092952, 1091967] Align LIBS_GUI with Tk head needs.
Diffstat (limited to 'win')
-rwxr-xr-xwin/configure21
-rw-r--r--win/tcl.m419
2 files changed, 23 insertions, 17 deletions
diff --git a/win/configure b/win/configure
index 3537756..0a62a08 100755
--- a/win/configure
+++ b/win/configure
@@ -1274,7 +1274,7 @@ SHELL=/bin/sh
TCL_VERSION=8.5
TCL_MAJOR_VERSION=8
TCL_MINOR_VERSION=5
-TCL_PATCH_LEVEL="a2"
+TCL_PATCH_LEVEL="a3"
VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION
TCL_DDE_VERSION=1.3
@@ -3160,7 +3160,7 @@ echo "$as_me: WARNING: \"64bit mode not supported with GCC on Windows\"" >&2;}
SHLIB_LD=""
SHLIB_LD_LIBS=""
LIBS=""
- LIBS_GUI="-lgdi32 -lcomdlg32 -limm32 -lcomctl32 -lshell32"
+ LIBS_GUI="-lgdi32 -lcomdlg32 -limm32 -lcomctl32 -lshell32 -lole32 -loleaut32 -luuid"
STLIB_LD='${AR} cr'
RC_OUT=-o
RC_TYPE=
@@ -3245,7 +3245,7 @@ echo "$as_me: error: ${CC} does not support the -shared option.
EXTRA_CFLAGS="${extra_cflags}"
CFLAGS_DEBUG=-g
- CFLAGS_OPTIMIZE=-O
+ CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer"
CFLAGS_WARNING="-Wall -Wconversion"
LDFLAGS_DEBUG=
LDFLAGS_OPTIMIZE=
@@ -3324,22 +3324,25 @@ echo "$as_me: WARNING: \"could not find 64-bit SDK to enable 64bit mode\"" >&2;}
-I${MSSDK}/Include"
RC="${MSSDK}/bin/rc.exe"
CFLAGS_DEBUG="-nologo -Zi -Od ${runtime}d"
- CFLAGS_OPTIMIZE="-nologo -O2 -Gs ${runtime}"
+ CFLAGS_OPTIMIZE="-nologo -O2 ${runtime}"
lflags="-MACHINE:IA64 -LIBPATH:${MSSDK}/Lib/IA64 \
-LIBPATH:${MSSDK}/Lib/Prerelease/IA64"
STLIB_LD="${MSSDK}/bin/win64/lib.exe -nologo ${lflags}"
LINKBIN="${MSSDK}/bin/win64/link.exe ${lflags}"
else
RC="rc"
+ # -Od - no optimization
+ # -WX - warnings as errors
CFLAGS_DEBUG="-nologo -Z7 -Od -WX ${runtime}d"
- CFLAGS_OPTIMIZE="-nologo -Oti -Gs -GD ${runtime}"
- STLIB_LD="lib -nologo"
- LINKBIN="link -link50compat"
+ # -O2 - create fast code (/Og /Oi /Ot /Oy /Ob2 /Gs /GF /Gy)
+ CFLAGS_OPTIMIZE="-nologo -O2 ${runtime}"
+ STLIB_LD="link -lib -nologo"
+ LINKBIN="link"
fi
SHLIB_LD="${LINKBIN} -dll -nologo -incremental:no"
LIBS="user32.lib advapi32.lib"
- LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib shell32.lib"
+ LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"
RC_OUT=-fo
RC_TYPE=-r
RC_INCLUDE=-i
@@ -3350,7 +3353,7 @@ echo "$as_me: WARNING: \"could not find 64-bit SDK to enable 64bit mode\"" >&2;}
MAKE_EXE="\${CC} -Fe\$@"
LIBPREFIX=""
- EXTRA_CFLAGS="-YX"
+ EXTRA_CFLAGS=""
CFLAGS_WARNING="-W3"
LDFLAGS_DEBUG="-debug:full -debugtype:both"
LDFLAGS_OPTIMIZE="-release"
diff --git a/win/tcl.m4 b/win/tcl.m4
index 4a73af7..cdd18e0 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -439,7 +439,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
SHLIB_LD=""
SHLIB_LD_LIBS=""
LIBS=""
- LIBS_GUI="-lgdi32 -lcomdlg32 -limm32 -lcomctl32 -lshell32"
+ LIBS_GUI="-lgdi32 -lcomdlg32 -limm32 -lcomctl32 -lshell32 -lole32 -loleaut32 -luuid"
STLIB_LD='${AR} cr'
RC_OUT=-o
RC_TYPE=
@@ -519,7 +519,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
EXTRA_CFLAGS="${extra_cflags}"
CFLAGS_DEBUG=-g
- CFLAGS_OPTIMIZE=-O
+ CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer"
CFLAGS_WARNING="-Wall -Wconversion"
LDFLAGS_DEBUG=
LDFLAGS_OPTIMIZE=
@@ -595,22 +595,25 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
-I${MSSDK}/Include"
RC="${MSSDK}/bin/rc.exe"
CFLAGS_DEBUG="-nologo -Zi -Od ${runtime}d"
- CFLAGS_OPTIMIZE="-nologo -O2 -Gs ${runtime}"
+ CFLAGS_OPTIMIZE="-nologo -O2 ${runtime}"
lflags="-MACHINE:IA64 -LIBPATH:${MSSDK}/Lib/IA64 \
-LIBPATH:${MSSDK}/Lib/Prerelease/IA64"
STLIB_LD="${MSSDK}/bin/win64/lib.exe -nologo ${lflags}"
LINKBIN="${MSSDK}/bin/win64/link.exe ${lflags}"
else
RC="rc"
+ # -Od - no optimization
+ # -WX - warnings as errors
CFLAGS_DEBUG="-nologo -Z7 -Od -WX ${runtime}d"
- CFLAGS_OPTIMIZE="-nologo -Oti -Gs -GD ${runtime}"
- STLIB_LD="lib -nologo"
- LINKBIN="link -link50compat"
+ # -O2 - create fast code (/Og /Oi /Ot /Oy /Ob2 /Gs /GF /Gy)
+ CFLAGS_OPTIMIZE="-nologo -O2 ${runtime}"
+ STLIB_LD="link -lib -nologo"
+ LINKBIN="link"
fi
SHLIB_LD="${LINKBIN} -dll -nologo -incremental:no"
LIBS="user32.lib advapi32.lib"
- LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib shell32.lib"
+ LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"
RC_OUT=-fo
RC_TYPE=-r
RC_INCLUDE=-i
@@ -621,7 +624,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
MAKE_EXE="\${CC} -Fe\[$]@"
LIBPREFIX=""
- EXTRA_CFLAGS="-YX"
+ EXTRA_CFLAGS=""
CFLAGS_WARNING="-W3"
LDFLAGS_DEBUG="-debug:full -debugtype:both"
LDFLAGS_OPTIMIZE="-release"