Tcl Source Code: Diff

Differences From Artifact [756f27ba58]:

File win/makefile.vc — part of check-in [8061d208d3] at 2008-12-22 14:49:32 on branch trunk — [Bug 2458395] Ensure pkgs directories are suitable and quote the paths. (user: patthoyts size: 39846)

To Artifact [70405cb233]:

File win/makefile.vc — part of check-in [8898dfcee4] at 2009-01-19 19:54:19 on branch trunk — * win/build.vc.bat: Improved tools detection and error message. * win/makefile.vc: Reorganized the $(TCLOBJ) file list into seperate parts for easier maintenance. Matched all source built using -GL to both $(lib) and $(link) to use -LTCG and avoid a warning message. * win/nmakehlp.c: Removed -g option and GrepForDefine() func as it isn't being used anymore. The -V option method is much better. (user: davygrvy size: 40046)

︙
9 10 11 12 13 14 15 16 17 18 19 20 21 22 23	9 10 11 12 13 14 15 16 17 18 19 20 21 22 23	- +	# Copyright (c) 1995-1996 Sun Microsystems, Inc. # Copyright (c) 1998-2000 Ajuba Solutions. # Copyright (c) 2001-2005 ActiveState Corporation. # Copyright (c) 2001-2004 David Gravereaux. # Copyright (c) 2003-2008 Pat Thoyts. # #------------------------------------------------------------------------------ ~~# RCS: @(#) $Id: makefile.vc,v 1.195 2008/1~~2/22~~ 14:49~~:32~~ ~~patthoyts~~ Exp $~~ # RCS: @(#) $Id: makefile.vc,v 1.196 2009/01/19 19:54:19 davygrvy Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) # or with the MS Platform SDK (MSSDK). Visual Studio .NET 2003 and 2005 define # VCINSTALLDIR instead. !if !defined(MSDEVDIR) && !defined(MSVCDIR) && !defined(MSSDK) && !defined(VCINSTALLDIR) MSG = ^
︙
243 244 245 246 247 248 249 ~~250~~ 251 252 253 254 255 256 257	243 244 245 246 247 248 249 250 251 252 253 254 255 256 257	- +	$(TMP_DIR)\tclWinTest.obj \ !if $(TCL_USE_STATIC_PACKAGES) $(TMP_DIR)\tclWinReg.obj \ $(TMP_DIR)\tclWinDde.obj \ !endif $(TMP_DIR)\testMain.obj ~~~~TCL~~OBJS = \~~ COREOBJS = \ $(TMP_DIR)\regcomp.obj \ $(TMP_DIR)\regerror.obj \ $(TMP_DIR)\regexec.obj \ $(TMP_DIR)\regfree.obj \ $(TMP_DIR)\tclAlloc.obj \ $(TMP_DIR)\tclAsync.obj \ $(TMP_DIR)\tclBasic.obj \
︙
322 323 324 325 326 327 328 ~~329 330 331 332 333 334 335 336 337 338 339 340 341 342 343~~ 344 345 346 347 348 349 350	322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352	- - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +	$(TMP_DIR)\tclThreadStorage.obj \ $(TMP_DIR)\tclTimer.obj \ $(TMP_DIR)\tclTomMathInterface.obj \ $(TMP_DIR)\tclTrace.obj \ $(TMP_DIR)\tclUtf.obj \ $(TMP_DIR)\tclUtil.obj \ $(TMP_DIR)\tclVar.obj \ $(TMP_DIR)\tcl~~Win32Dll~~.obj \ ~~$(TMP_DIR)\tclWinChan.obj \~~ $(TMP_DIR)\~~tclWinConso~~le.obj \ $(TMP_DIR)\tc~~lWinS~~e~~rial~~.obj \ $(TMP_DIR)\~~tclWinError~~.obj \ $(TMP_DIR)\t~~clWinFCmd~~.obj \ $(TMP_DIR)\~~tclWinFile~~.obj \ $(TMP_DIR)\~~tclW~~in~~Init~~.obj \ $(TMP_DIR)\~~tclW~~in~~Load~~.obj \ $(TMP_DIR)\~~tclW~~in~~Notify~~.obj \ $(TMP_DIR)\~~tclW~~in~~Pipe~~.obj \ $(TMP_DIR)\t~~clWinSock~~.obj \ $(TMP_DIR)\tc~~lWinThrd~~.obj \ $(TMP_DIR)\~~tclWinTime~~.obj \ ~~$(TMP_DIR)\tclZlib.obj \~~ $(TMP_DIR)\tclZlib.obj ZLIBOBJS = \ $(TMP_DIR)\adler32.obj \ $(TMP_DIR)\compress.obj \ $(TMP_DIR)\crc32.obj \ $(TMP_DIR)\deflate.obj \ $(TMP_DIR)\gzio.obj \ $(TMP_DIR)\infback.obj \ $(TMP_DIR)\inffast.obj \ $(TMP_DIR)\inflate.obj \ $(TMP_DIR)\inftrees.obj \ $(TMP_DIR)\trees.obj \ $(TMP_DIR)\uncompr.obj \ $(TMP_DIR)\zutil.obj TOMMATHOBJS = \ $(TMP_DIR)\bncore.obj \ $(TMP_DIR)\bn_reverse.obj \ $(TMP_DIR)\bn_fast_s_mp_mul_digs.obj \ $(TMP_DIR)\bn_fast_s_mp_sqr.obj \ $(TMP_DIR)\bn_mp_add.obj \ $(TMP_DIR)\bn_mp_add_d.obj \ $(TMP_DIR)\bn_mp_and.obj \
︙
397 398 399 400 401 402 403 ~~404~~ 405 406 407 408 ~~409 410 411 412 413~~ 414 ~~415~~ 416 417 418 419 420 421 422	399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435	- + + + + + + + + + + + + + + + + + - - - - - - +	$(TMP_DIR)\bn_mp_toradix_n.obj \ $(TMP_DIR)\bn_mp_unsigned_bin_size.obj \ $(TMP_DIR)\bn_mp_xor.obj \ $(TMP_DIR)\bn_mp_zero.obj \ $(TMP_DIR)\bn_s_mp_add.obj \ $(TMP_DIR)\bn_s_mp_mul_digs.obj \ $(TMP_DIR)\bn_s_mp_sqr.obj \ ~~$(TMP_DIR)\bn_s_mp_sub.obj \~~ $(TMP_DIR)\bn_s_mp_sub.obj PLATFORMOBJS = \ $(TMP_DIR)\tclWin32Dll.obj \ $(TMP_DIR)\tclWinChan.obj \ $(TMP_DIR)\tclWinConsole.obj \ $(TMP_DIR)\tclWinError.obj \ $(TMP_DIR)\tclWinFCmd.obj \ $(TMP_DIR)\tclWinFile.obj \ $(TMP_DIR)\tclWinInit.obj \ $(TMP_DIR)\tclWinLoad.obj \ $(TMP_DIR)\tclWinNotify.obj \ $(TMP_DIR)\tclWinPipe.obj \ $(TMP_DIR)\tclWinSerial.obj \ $(TMP_DIR)\tclWinSock.obj \ $(TMP_DIR)\tclWinThrd.obj \ $(TMP_DIR)\tclWinTime.obj \ !if !$(STATIC_BUILD) $(TMP_DIR)\tcl.res !endif ~~ZLIBOBJS = \~~ ~~$(TMP_DIR)\adler32.obj $(TMP_DIR)\compress.obj $(TMP_DIR)\crc32.obj \~~ ~~$(TMP_DIR)\deflate.obj $(TMP_DIR)\gzio.obj $(TMP_DIR)\infback.obj \~~ ~~$(TMP_DIR)\inffast.obj $(TMP_DIR)\inflate.obj $(TMP_DIR)\inftrees.obj \~~ ~~$(TMP_DIR)\trees.obj $(TMP_DIR)\uncompr.obj $(TMP_DIR)\zutil.obj~~ ~~TCLOBJS = $(~~TCL~~OBJS) $(ZLIBOBJS)~~ TCLOBJS = $(COREOBJS) $(ZLIBOBJS) $(TOMMATHOBJS) $(PLATFORMOBJS) TCLSTUBOBJS = \ $(TMP_DIR)\tclStubLib.obj \ $(TMP_DIR)\tclOOStubLib.obj ### The following paths CANNOT have spaces in them. COMPATDIR = $(ROOT)\compat
︙
468 469 470 471 472 473 474 ~~475 476~~ 477 478 479 480 481 482 483	481 482 483 484 485 486 487 488 489 490 491 492 493 494 495	- - +	TCL_INCLUDES = -I"$(WINDIR)" -I"$(GENERICDIR)" -I"$(TOMMATHDIR)" TCL_DEFINES = -DTCL_PIPE_DLL=\"$(TCLPIPEDLLNAME)\" -DTCL_TOMMATH -DMP_PREC=4 \ -Dinline=__inline -DHAVE_ZLIB=1 BASE_CFLAGS = $(cflags) $(cdebug) $(crt) $(TCL_INCLUDES) $(TCL_DEFINES) CON_CFLAGS = $(cflags) $(cdebug) $(crt) -DCONSOLE TCL_CFLAGS = $(BASE_CFLAGS) $(OPTDEFINES) ~~~~### Stubs files should not be compiled with -GL~~ STUB_CFLAGS = $(cflags) $(cdebug~~:-GL=~~) $(OPTDEFINES)~~ STUB_CFLAGS = $(cflags) $(cdebug) $(OPTDEFINES) #--------------------------------------------------------------------- # Link flags #--------------------------------------------------------------------- !if $(DEBUG)
︙
569 570 571 572 573 574 575 ~~576~~ 577 578 579 580 581 582 583 584 585 586 587 588 ~~589~~ 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 ~~609~~ 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 ~~625~~ 626 627 628 629 630 631 632	581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644	- + - + - + - +	!if !$(STATIC_BUILD) $(TCLIMPLIB): $(TCLLIB) !endif $(TCLLIB): $(TCLOBJS) !if $(STATIC_BUILD) ~~$(lib32) -nologo -out:$@ @<<~~ $(lib32) -nologo $(LINKERFLAGS) -out:$@ @<< $ << !else $(link32) $(dlllflags) -base:@$(WINDIR)\coffbase.txt,tcl -out:$@ \ $(baselibs) @<< $ << $(_VC_MANIFEST_EMBED_DLL) -@del $.exp !endif $(TCLSTUBLIB): $(TCLSTUBOBJS) ~~$(lib32) -nologo -out:$@ $(TCLSTUBOBJS)~~ $(lib32) -nologo $(LINKERFLAGS) -out:$@ $(TCLSTUBOBJS) $(TCLSH): $(TCLSHOBJS) $(TCLIMPLIB) $(link32) $(conlflags) -stack:2300000 -out:$@ $(baselibs) $* $(_VC_MANIFEST_EMBED_EXE) $(TCLTEST): $(TCLTESTOBJS) $(TCLIMPLIB) $(link32) $(conlflags) -stack:2300000 -out:$@ $(baselibs) $ $(_VC_MANIFEST_EMBED_EXE) $(TCLPIPEDLL): $(WINDIR)\stub16.c $(cc32) $(CON_CFLAGS) -Fo$(TMP_DIR)\ $(WINDIR)\stub16.c $(link32) $(conlflags) -out:$@ $(TMP_DIR)\stub16.obj $(baselibs) $(_VC_MANIFEST_EMBED_DLL) !if $(STATIC_BUILD) !if $(TCL_USE_STATIC_PACKAGES) $(TCLDDELIB): !else $(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj ~~$(lib32) -nologo -out:$@ $(TMP_DIR)\tclWinDde.obj~~ $(lib32) -nologo $(LINKERFLAGS) -out:$@ $(TMP_DIR)\tclWinDde.obj !endif !else $(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj $(TCLSTUBLIB) $(link32) $(dlllflags) -base:@$(WINDIR)\coffbase.txt,tcldde -out:$@ \ $ $(baselibs) $(_VC_MANIFEST_EMBED_DLL) -@del $.exp -@del $.lib !endif !if $(STATIC_BUILD) !if $(TCL_USE_STATIC_PACKAGES) $(TCLREGLIB): !else $(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj ~~$(lib32) -nologo -out:$@ $(TMP_DIR)\tclWinReg.obj~~ $(lib32) -nologo $(LINKERFLAGS) -out:$@ $(TMP_DIR)\tclWinReg.obj !endif !else $(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj $(TCLSTUBLIB) $(link32) $(dlllflags) -base:@$(WINDIR)\coffbase.txt,tclreg -out:$@ \ $** $(baselibs) $(_VC_MANIFEST_EMBED_DLL) -@del $*.exp
︙
712 713 714 715 716 717 718 ~~719~~ 720 721 722 723 724 725 726	724 725 726 727 728 729 730 731 732 733 734 735 736 737 738	- +	HTMLDIR=$(ROOT)\html HTMLBASE=TclTk$(VERSION) HHPFILE=$(HTMLDIR)\$(HTMLBASE).hhp CHMFILE=$(HTMLDIR)\$(HTMLBASE).chm htmlhelp: chmsetup $(HHPFILE) $(TCLSH) $(TOOLSDIR)\tcltk-man2html.tcl ~~"$(HHC)" $(HHPFILE) >NUL~~ $(HHC) $(HHPFILE) >NUL chmsetup: @if not exist $(HTMLDIR)\nul mkdir $(HTMLDIR) $(HHPFILE): type << > $@ [OPTIONS]
︙
990 991 992 993 994 995 996 ~~997~~ 998 999 1000 1001 1002 1003 1004	1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018	- + + +	!endif ### add a spacer in the output !message #--------------------------------------------------------------------- ~~# Implicit rules~~ # Implicit rules. A limitation exists with nmake that requires that # source directory can not contain spaces in the path. This an # absolute. #--------------------------------------------------------------------- {$(WINDIR)}.c{$(TMP_DIR)}.obj:: $(cc32) $(TCL_CFLAGS) -DBUILD_tcl -Fo$(TMP_DIR)\ @<< $< <<
︙