summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-07-18 06:36:09 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-07-18 06:36:09 (GMT)
commitb5337487d63c70b72986da7d9c35648f6a1e3b41 (patch)
tree6adc85714728aaca1618738782409d05e4dec01c /win
parent3b8fab461b98433d47b90aeeccf88e857a115ff3 (diff)
downloadtcl-b5337487d63c70b72986da7d9c35648f6a1e3b41.zip
tcl-b5337487d63c70b72986da7d9c35648f6a1e3b41.tar.gz
tcl-b5337487d63c70b72986da7d9c35648f6a1e3b41.tar.bz2
FRQ-3544967: Missing objectfiles in static lib
Diffstat (limited to 'win')
-rw-r--r--win/makefile.vc14
-rw-r--r--win/tclWinReg.c5
2 files changed, 12 insertions, 7 deletions
diff --git a/win/makefile.vc b/win/makefile.vc
index 5183504..6bdcc07 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -83,8 +83,8 @@ the build instructions.
# msvcrt(d). This is useful for static embedding
# support.
# staticpkg = Affects the static option only to switch
-# tclshXX.exe to have the dde and reg extension linked
-# inside it.
+# tclXX.lib and tclshXX.exe to have the dde and
+# reg extension linked inside it.
# nothreads = Turns off full multithreading support.
# thrdalloc = Use the thread allocator (shared global free pool)
# This is the default on threaded builds.
@@ -231,10 +231,12 @@ INCLUDE_INSTALL_DIR = $(_INSTALLDIR)\include
TCLSHOBJS = \
$(TMP_DIR)\tclAppInit.obj \
+!if !$(STATIC_BUILD)
!if $(TCL_USE_STATIC_PACKAGES)
$(TMP_DIR)\tclWinReg.obj \
$(TMP_DIR)\tclWinDde.obj \
!endif
+!endif
$(TMP_DIR)\tclsh.res
TCLTESTOBJS = \
@@ -243,10 +245,12 @@ TCLTESTOBJS = \
$(TMP_DIR)\tclTestProcBodyObj.obj \
$(TMP_DIR)\tclThreadTest.obj \
$(TMP_DIR)\tclWinTest.obj \
+!if !$(STATIC_BUILD)
!if $(TCL_USE_STATIC_PACKAGES)
$(TMP_DIR)\tclWinReg.obj \
$(TMP_DIR)\tclWinDde.obj \
!endif
+!endif
$(TMP_DIR)\testMain.obj
COREOBJS = \
@@ -428,11 +432,13 @@ PLATFORMOBJS = \
$(TMP_DIR)\tclWinSock.obj \
$(TMP_DIR)\tclWinThrd.obj \
$(TMP_DIR)\tclWinTime.obj \
-!if !$(STATIC_BUILD)
+!if $(STATIC_BUILD)
+ $(TMP_DIR)\tclWinReg.obj \
+ $(TMP_DIR)\tclWinDde.obj \
+!else
$(TMP_DIR)\tcl.res
!endif
-
TCLOBJS = $(COREOBJS) $(ZLIBOBJS) $(TOMMATHOBJS) $(PLATFORMOBJS)
TCLSTUBOBJS = \
diff --git a/win/tclWinReg.c b/win/tclWinReg.c
index d2f233e..9c08b0c 100644
--- a/win/tclWinReg.c
+++ b/win/tclWinReg.c
@@ -13,9 +13,8 @@
*/
#undef STATIC_BUILD
-#ifndef USE_TCL_STUBS
-# define USE_TCL_STUBS
-#endif
+#undef USE_TCL_STUBS
+#define USE_TCL_STUBS
#include "tclInt.h"
#ifdef _MSC_VER
# pragma comment (lib, "advapi32.lib")