/ Check-in [8155b5ac]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:For MSVC, simplify default locations for Tcl and ICU by using directories inside 'compat'.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | sqlar-shell-support
Files: files | file ages | folders
SHA3-256: 8155b5ac850327ea76aba2adf624132f3e05024c973afd218b12f186fc7630e8
User & Date: mistachkin 2017-12-05 19:07:30
Context
2017-12-07
15:44
Begin adding support for the sqlar archive format to shell.c. There is no "extract" command so far, only "create". check-in: c9827a01 user: dan tags: sqlar-shell-support
2017-12-05
19:07
For MSVC, simplify default locations for Tcl and ICU by using directories inside 'compat'. check-in: 8155b5ac user: mistachkin tags: sqlar-shell-support
18:54
Add support for including zlib in the shell when compiling with MSVC. check-in: e1838cee user: mistachkin tags: sqlar-shell-support
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.msc.

    88     88   # be used for debugging with Visual Studio.
    89     89   #
    90     90   !IFNDEF SPLIT_AMALGAMATION
    91     91   SPLIT_AMALGAMATION = 0
    92     92   !ENDIF
    93     93   
    94     94   # <<mark>>
           95  +# Set this non-0 to have this makefile assume the Tcl shell executable
           96  +# (tclsh*.exe) is available in the PATH.  By default, this is enabled
           97  +# for compatibility with older build environments.  This setting only
           98  +# applies if TCLSH_CMD is not set manually.
           99  +#
          100  +!IFNDEF USE_TCLSH_IN_PATH
          101  +USE_TCLSH_IN_PATH = 1
          102  +!ENDIF
          103  +
    95    104   # Set this non-0 to use zlib, possibly compiling it from source code.
    96    105   #
    97    106   !IFNDEF USE_ZLIB
    98    107   USE_ZLIB = 0
    99    108   !ENDIF
   100    109   
   101    110   # Set this non-0 to build zlib from source code.  This is enabled by
................................................................................
   821    830   # The locations of the Tcl header and library files.  Also, the library that
   822    831   # non-stubs enabled programs using Tcl must link against.  These variables
   823    832   # (TCLINCDIR, TCLLIBDIR, and LIBTCL) may be overridden via the environment
   824    833   # prior to running nmake in order to match the actual installed location and
   825    834   # version on this machine.
   826    835   #
   827    836   !IFNDEF TCLDIR
   828         -TCLDIR = c:\tcl
          837  +TCLDIR = $(TOP)\compat\tcl
   829    838   !ENDIF
   830    839   
   831    840   !IFNDEF TCLINCDIR
   832    841   TCLINCDIR = $(TCLDIR)\include
   833    842   !ENDIF
   834    843   
   835    844   !IFNDEF TCLLIBDIR
................................................................................
   875    884   
   876    885   # The locations of the ICU header and library files.  These variables
   877    886   # (ICUINCDIR, ICULIBDIR, and LIBICU) may be overridden via the environment
   878    887   # prior to running nmake in order to match the actual installed location on
   879    888   # this machine.
   880    889   #
   881    890   !IFNDEF ICUDIR
   882         -ICUDIR = C:\icu
          891  +ICUDIR = $(TOP)\compat\icu
   883    892   !ENDIF
   884    893   
   885    894   !IFNDEF ICUINCDIR
   886    895   ICUINCDIR = $(ICUDIR)\include
   887    896   !ENDIF
   888    897   
   889    898   !IFNDEF ICULIBDIR
................................................................................
   896    905   
   897    906   # This is the command to use for tclsh - normally just "tclsh", but we may
   898    907   # know the specific version we want to use.  This variable (TCLSH_CMD) may be
   899    908   # overridden via the environment prior to running nmake in order to select a
   900    909   # specific Tcl shell to use.
   901    910   #
   902    911   !IFNDEF TCLSH_CMD
          912  +!IF $(USE_TCLSH_IN_PATH)!=0
   903    913   TCLSH_CMD = tclsh
          914  +!ELSE
          915  +TCLSH_CMD = $(TCLDIR)\bin\tclsh.exe
          916  +!ENDIF
   904    917   !ENDIF
   905    918   # <</mark>>
   906    919   
   907    920   # Compiler options needed for programs that use the readline() library.
   908    921   #
   909    922   !IFNDEF READLINE_FLAGS
   910    923   READLINE_FLAGS = -DHAVE_READLINE=0