diff options
| -rw-r--r-- | win/makefile.vc | 23 | ||||
| -rw-r--r-- | win/rules.vc | 25 |
2 files changed, 25 insertions, 23 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index 353c258..70a53f3 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -416,11 +416,6 @@ TK_CFLAGS = $(pkgcflags) WISH_CFLAGS = $(appcflags_nostubs)
-
-
-tcllibs = $(TCLSTUBLIB) $(TCLIMPLIB)
-
-
# Avoid 'unresolved external symbol __security_cookie' errors.
# c.f. http://support.microsoft.com/?id=894573
!if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"
@@ -550,27 +545,26 @@ $** $(TKSTUBLIB): $(TKSTUBOBJS)
- $(lib32) -nologo -nodefaultlib -out:$@ $**
+ $(MAKELIBCMD) -nodefaultlib $**
$(WISH): $(WISHOBJS) $(TKSTUBLIB) $(TKIMPLIB)
- $(link32) $(guilflags) -stack:2300000 -out:$@ $(guilibs) $(tcllibs) $**
+ $(MAKEGUICMD) -stack:2300000 $**
$(_VC_MANIFEST_EMBED_EXE)
$(WISHC): $(WISHOBJS) $(TKSTUBLIB) $(TKIMPLIB)
- $(link32) $(conlflags) -stack:2300000 -out:$@ $(guilibs) $(tcllibs) $**
+ $(MAKECONCMD) -stack:2300000 $**
$(_VC_MANIFEST_EMBED_EXE)
$(TKTEST): $(TKTESTOBJS) $(TKSTUBLIB) $(TKIMPLIB)
- $(link32) $(guilflags) -stack:2300000 -out:$@ $(guilibs) $(tcllibs) $**
+ $(MAKEGUICMD) -stack:2300000 $**
$(_VC_MANIFEST_EMBED_EXE)
$(CAT32): $(_TCLDIR)\win\cat.c
- $(cc32) $(cflags) $(crt) -DCONSOLE -Fo$(TMP_DIR)\ $?
- $(MAKECONCMD) -stack:16384 $(TMP_DIR)\cat.obj
+ $(MAKECONCMD) -DCONSOLE -stack:16384 $(TMP_DIR)\cat.obj
$(_VC_MANIFEST_EMBED_EXE)
#---------------------------------------------------------------------
@@ -819,13 +813,6 @@ $< $<
<<
-{$(RCDIR)}.rc{$(TMP_DIR)}.res:
- $(rc32) -fo $@ -r -i "$(GENERICDIR)" -i "$(TMP_DIR)" $(TCL_INCLUDES) \
- -d DEBUG=$(DEBUG) -d UNCHECKED=$(UNCHECKED) \
- -d TCL_THREADS=$(TCL_THREADS) \
- -d STATIC_BUILD=$(STATIC_BUILD) \
- $<
-
$(TMP_DIR)\tk.res: $(TMP_DIR)\wish.exe.manifest
$(TMP_DIR)\wish.res: $(TMP_DIR)\wish.exe.manifest
diff --git a/win/rules.vc b/win/rules.vc index be49672..2744330 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -922,6 +922,8 @@ TCL_INCLUDES = -I"$(_TCLDIR)\generic" -I"$(_TCLDIR)\win" !endif # TCLINSTALL
+tcllibs = "$(TCLSTUBLIB)" "$(TCLIMPLIB)"
+
!endif $(PROJECT) != "tcl"
# We need a tclsh that will run on the host machine as part of the build.
@@ -1129,8 +1131,8 @@ cflags = -nologo -c $(COMPILERFLAGS) $(cwarn) -Fp$(TMP_DIR)^\ $(cdebug) appcflags = $(cflags) $(crt) $(TCL_INCLUDES) $(TK_INCLUDES) $(PRJ_INCLUDES) $(TCL_DEFINES) $(PRJ_DEFINES) $(OPTDEFINES) $(USE_STUBS_DEFS)
appcflags_nostubs = $(cflags) $(crt) $(TCL_INCLUDES) $(TK_INCLUDES) $(PRJ_INCLUDES) $(TCL_DEFINES) $(PRJ_DEFINES) $(OPTDEFINES)
-pkgcflags = $(appcflags) /DBUILD_$(PROJECT)
-pkgcflags_nostubs = $(appcflags_nostubs) /DBUILD_$(PROJECT)
+pkgcflags = $(appcflags) -DBUILD_$(PROJECT)
+pkgcflags_nostubs = $(appcflags_nostubs) -DBUILD_$(PROJECT)
# stubscflags contains $(cflags) plus flags used for building a stubs
# library for the package. Note: -DSTATIC_BUILD is defined in
@@ -1249,13 +1251,26 @@ $< $<
<<
+{$(RCDIR)}.rc{$(TMP_DIR)}.res:
+ $(MAKERESCMD)
+
+{$(WINDIR)}.rc{$(TMP_DIR)}.res:
+ $(MAKERESCMD)
+
.SUFFIXES:
.SUFFIXES:.c .rc
MAKELIBCMD = $(lib32) -nologo $(LINKERFLAGS) -out:$@
-MAKEDLLCMD = $(link32) $(dlllflags) -out:$@ $(baselibs)
-MAKECONCMD = $(link32) $(conlflags) -out:$@ $(baselibs)
-MAKEGUICMD = $(link32) $(guilflags) -out:$@ $(baselibs)
+MAKEDLLCMD = $(link32) $(dlllflags) -out:$@ $(baselibs) $(tcllibs)
+MAKECONCMD = $(link32) $(conlflags) -out:$@ $(baselibs) $(tcllibs)
+MAKEGUICMD = $(link32) $(guilflags) -out:$@ $(baselibs) $(tcllibs)
+MAKERESCMD = $(rc32) -fo $@ -r -i "$(GENERICDIR)" -i "$(TMP_DIR)" \
+ $(TCL_INCLUDES) \
+ -d DEBUG=$(DEBUG) -d UNCHECKED=$(UNCHECKED) \
+ -d TCL_THREADS=$(TCL_THREADS) \
+ -d STATIC_BUILD=$(STATIC_BUILD) \
+ $<
+
################################################################
# 14. Sanity check selected options against Tcl build options
|