summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2021-01-13 10:29:46 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2021-01-13 10:29:46 (GMT)
commitd7421b258412139f3cdac2d79f3c0ae12ae470b5 (patch)
treead1f1a3a538ddae618ce70b9de81f97dfe8af897 /win
parent1dc2f9841638ee6ce8959dbe9605c0afb49c9d91 (diff)
parent37fa709e5aa457561e9903f25e1072cbdfd66b7d (diff)
downloadtk-d7421b258412139f3cdac2d79f3c0ae12ae470b5.zip
tk-d7421b258412139f3cdac2d79f3c0ae12ae470b5.tar.gz
tk-d7421b258412139f3cdac2d79f3c0ae12ae470b5.tar.bz2
Fix [f6c5365244]: compilation error Windows 10 / Visual Studio 2019
Diffstat (limited to 'win')
-rwxr-xr-xwin/configure2
-rw-r--r--win/configure.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/win/configure b/win/configure
index 5b433f6..2f74984 100755
--- a/win/configure
+++ b/win/configure
@@ -4963,7 +4963,7 @@ TK_EXPORT_FILE_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}"
eval "TK_SRC_DIR=\"`cd $srcdir/..; pwd`\""
eval "TK_DLL_FILE=tk$VER${DLLSUFFIX}"
-if test ${SHARED_BUILD} = 0 ; then
+if test ${SHARED_BUILD} = 0 -o "$GCC" != "yes" ; then
eval "TK_LIB_FILE=${LIBPREFIX}tk${VER}${LIBSUFFIX}"
else
eval "TK_LIB_FILE=${LIBPREFIX}tk${VER}${DLLSUFFIX}.a"
diff --git a/win/configure.in b/win/configure.in
index 28f8d98..56d5d30 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -167,7 +167,7 @@ TK_EXPORT_FILE_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}"
eval "TK_SRC_DIR=\"`cd $srcdir/..; pwd`\""
eval "TK_DLL_FILE=tk$VER${DLLSUFFIX}"
-if test ${SHARED_BUILD} = 0 ; then
+if test ${SHARED_BUILD} = 0 -o "$GCC" != "yes" ; then
eval "TK_LIB_FILE=${LIBPREFIX}tk${VER}${LIBSUFFIX}"
else
eval "TK_LIB_FILE=${LIBPREFIX}tk${VER}${DLLSUFFIX}.a"