diff options
| author | apnadkarni <apnadkarni@noemail.net> | 2017-09-25 16:23:34 (GMT) |
|---|---|---|
| committer | apnadkarni <apnadkarni@noemail.net> | 2017-09-25 16:23:34 (GMT) |
| commit | 4ce731e5e74b5dfbdba1d3085dbbb771a87489cc (patch) | |
| tree | 0e79b8398548f79d419f8847cb62c6079cdedec5 | |
| parent | 2d15170791c869427f1872e13c22d884a4f2c4a4 (diff) | |
| download | tcl-4ce731e5e74b5dfbdba1d3085dbbb771a87489cc.zip tcl-4ce731e5e74b5dfbdba1d3085dbbb771a87489cc.tar.gz tcl-4ce731e5e74b5dfbdba1d3085dbbb771a87489cc.tar.bz2 | |
Unify build commands with MAKE{LIB,DLL,CON,GUI}CMD macros
FossilOrigin-Name: 1e35d5e767ded7b489ba003bc3bb4fff755a3f01484b492b6f71358018efa8f9
| -rw-r--r-- | win/makefile.vc | 24 | ||||
| -rw-r--r-- | win/rules.vc | 5 |
2 files changed, 14 insertions, 15 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index 2ef453b..b42257c 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -536,45 +536,42 @@ $(TCLIMPLIB): $(TCLLIB) $(TCLLIB): $(TCLOBJS)
!if $(STATIC_BUILD)
- $(lib32) -nologo $(LINKERFLAGS) -out:$@ @<<
+ $(MAKELIBCMD) @<<
$**
<<
!else
- $(link32) $(dlllflags) -base:@$(WINDIR)\coffbase.txt,tcl -out:$@ \
- $(baselibs) @<<
+ $(MAKEDLLCMD) @<<
$**
<<
$(_VC_MANIFEST_EMBED_DLL)
!endif
$(TCLSTUBLIB): $(TCLSTUBOBJS)
- $(lib32) -nologo $(LINKERFLAGS) -nodefaultlib -out:$@ $(TCLSTUBOBJS)
+ $(MAKELIBCMD) -nodefaultlib $(TCLSTUBOBJS)
$(TCLSH): $(TCLSHOBJS) $(TCLSTUBLIB) $(TCLIMPLIB)
- $(link32) $(conlflags) -stack:2300000 -out:$@ $(baselibs) $**
+ $(MAKECONCMD) -stack:2300000 $**
$(_VC_MANIFEST_EMBED_EXE)
$(TCLTEST): $(TCLTESTOBJS) $(TCLSTUBLIB) $(TCLIMPLIB)
- $(link32) $(conlflags) -stack:2300000 -out:$@ $(baselibs) $**
+ $(MAKECONCMD) -stack:2300000 $**
$(_VC_MANIFEST_EMBED_EXE)
!if $(STATIC_BUILD)
$(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj
- $(lib32) -nologo $(LINKERFLAGS) -out:$@ $**
+ $(MAKELIBCMD) $**
!else
$(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj $(TCLSTUBLIB)
- $(link32) $(dlllflags) -base:@$(WINDIR)\coffbase.txt,tcldde -out:$@ \
- $** $(baselibs)
+ $(MAKEDLLCMD) -base:@$(WINDIR)\coffbase.txt,tcldde $**
$(_VC_MANIFEST_EMBED_DLL)
!endif
!if $(STATIC_BUILD)
$(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj
- $(lib32) -nologo $(LINKERFLAGS) -out:$@ $**
+ $(MAKELIBCMD) $**
!else
$(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj $(TCLSTUBLIB)
- $(link32) $(dlllflags) -base:@$(WINDIR)\coffbase.txt,tclreg -out:$@ \
- $** $(baselibs)
+ $(MAKEDLLCMD) -base:@$(WINDIR)\coffbase.txt,tclreg $**
$(_VC_MANIFEST_EMBED_DLL)
!endif
@@ -612,8 +609,7 @@ clean-pkgs: $(CAT32): $(WINDIR)\cat.c
$(cc32) $(cflags) $(crt) -DCONSOLE -Fo$(TMP_DIR)\ $?
- $(link32) $(conlflags) -out:$@ -stack:16384 $(TMP_DIR)\cat.obj \
- $(baselibs)
+ $(MAKECONCMD) -stack:16384 $(TMP_DIR)\cat.obj
$(_VC_MANIFEST_EMBED_EXE)
#---------------------------------------------------------------------
diff --git a/win/rules.vc b/win/rules.vc index 5afcf5e..22379c4 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -1154,7 +1154,10 @@ $< .SUFFIXES:
.SUFFIXES:.c .rc
-
+MAKELIBCMD = $(lib32) -nologo $(LINKERFLAGS) -out:$@
+MAKEDLLCMD = $(link32) $(dlllflags) -base:@$(WINDIR)\coffbase.txt,tcl -out:$@ $(baselibs)
+MAKECONEXECMD = $(link32) $(conlflags) -out:$@ $(baselibs)
+MAKEGUIEXECMD = $(link32) $(guilflags) -out:$@ $(baselibs)
#----------------------------------------------------------
# Display stats being used.
|