Changes On Branch better-mingw-v2
Not logged in

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

Changes In Branch better-mingw-v2 Excluding Merge-Ins

This is equivalent to a diff from cc2aa92ef8 to e55c7139b4

2012-08-23
21:18
Merge in the mingw build enhancements. check-in: 5253e0a791 user: drh tags: trunk
14:29
... and the makemake.tcl corresponding changes as well Closed-Leaf check-in: e55c7139b4 user: jan.nijtmans tags: better-mingw-v2
14:20
if openssl is compiled with zlib support enabled, then -lz should be after -lssl -lcrypto check-in: 69608104d2 user: jan.nijtmans tags: better-mingw-v2
11:59
Various build and resource fixes. check-in: f008c97ae1 user: mistachkin tags: better-mingw-v2
10:13
Better mingw/mingw64 support for (cross-)compile on Linux, Darwin, Cygwin or Msys. Closed-Leaf check-in: cc2aa92ef8 user: jan.nijtmans tags: better-mingw
09:23
Added a maintenance reminder/potential fixme note. check-in: 4e66a96946 user: stephan tags: trunk

Changes to src/makemake.tcl.

   325    325   # WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
   326    326   ##############################################################################
   327    327   #
   328    328   # This file is automatically generated.  Instead of editing this
   329    329   # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
   330    330   # to regenerate this file.
   331    331   #
   332         -# This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW/Mingw-w64.
          332  +# This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW or
          333  +# MinGW-w64.
   333    334   #
   334    335   
   335         -####
          336  +#### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
          337  +#    By default, this is an empty string (i.e. use the native compiler).
   336    338   #
   337         -# Select one of mingw, mingw-64 (32-bit) or mingw-w64 (64-bit)
   338         -#
   339         -PREFIX=i686-pc-mingw32-
   340         -#PREFIX=i686-w64-mingw32-
   341         -#PREFIX=x86_64-w64-mingw32-
          339  +PREFIX =
          340  +# PREFIX = i686-pc-mingw32-
          341  +# PREFIX = i686-w64-mingw32-
          342  +# PREFIX = x86_64-w64-mingw32-
   342    343   
   343    344   #### The toplevel directory of the source tree.  Fossil can be built
   344    345   #    in a directory that is separate from the source tree.  Just change
   345    346   #    the following to point from the build directory to the src/ folder.
   346    347   #
   347    348   SRCDIR = src
   348    349   
................................................................................
   423    424   #    will run on the target platform.  This is usually the same
   424    425   #    as BCC, unless you are cross-compiling.  This C compiler builds
   425    426   #    the finished binary for fossil.  The BCC compiler above is used
   426    427   #    for building intermediate code-generator tools.
   427    428   #
   428    429   TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
   429    430   
          431  +#### Compile resources for use in building executables that will run
          432  +#    on the target platform.
          433  +#
          434  +RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
          435  +
   430    436   # With HTTPS support
   431    437   ifdef FOSSIL_ENABLE_SSL
   432    438   TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
          439  +RCC += -I$(OPENSSLINCDIR)
   433    440   endif
   434    441   
   435    442   # With Tcl support
   436    443   ifdef FOSSIL_ENABLE_TCL
   437    444   ifdef FOSSIL_TCL_SOURCE
   438    445   TCC += -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
          446  +RCC += -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
   439    447   else
   440    448   TCC += -L$(TCLLIBDIR) -I$(TCLINCDIR)
          449  +RCC += -I$(TCLINCDIR)
   441    450   endif
   442    451   endif
   443    452   
   444    453   # With HTTPS support
   445    454   ifdef FOSSIL_ENABLE_SSL
   446    455   TCC += -DFOSSIL_ENABLE_SSL=1
          456  +RCC += -DFOSSIL_ENABLE_SSL=1
   447    457   endif
   448    458   
   449    459   # With Tcl support (statically linked)
   450    460   ifdef FOSSIL_ENABLE_TCL
   451    461   TCC += -DFOSSIL_ENABLE_TCL=1 -DSTATIC_BUILD
          462  +RCC += -DFOSSIL_ENABLE_TCL=1
   452    463   endif
   453    464   
   454    465   # With JSON support
   455    466   ifdef FOSSIL_ENABLE_JSON
   456    467   TCC += -DFOSSIL_ENABLE_JSON=1
          468  +RCC += -DFOSSIL_ENABLE_JSON=1
   457    469   endif
   458    470   
   459         -#### Extra arguments for linking the finished binary.  Fossil needs
   460         -#    to link against the Z-Lib compression library.  There are no
   461         -#    other mandatory dependencies.  We add the -static option here
   462         -#    so that we can build a static executable that will run in a
   463         -#    chroot jail.
          471  +#### We add the -static option here so that we can build a static
          472  +#    executable that will run in a chroot jail.
   464    473   #
   465    474   LIB = -static
   466         -LIB += -lmingwex -lz
   467    475   
   468    476   # OpenSSL: Add the necessary libraries required, if enabled.
   469    477   ifdef FOSSIL_ENABLE_SSL
   470    478   LIB += -lssl -lcrypto -lgdi32
   471    479   endif
   472    480   
   473    481   # Tcl: Add the necessary libraries required, if enabled.
   474    482   ifdef FOSSIL_ENABLE_TCL
   475    483   LIB += $(LIBTCL)
   476    484   endif
          485  +
          486  +#### Extra arguments for linking the finished binary.  Fossil needs
          487  +#    to link against the Z-Lib compression library.  There are no
          488  +#    other mandatory dependencies.
          489  +#
          490  +LIB += -lmingwex -lz
   477    491   
   478    492   #### These libraries MUST appear in the same order as they do for Tcl
   479    493   #    or linking with it will not work (exact reason unknown).
   480    494   #
   481    495   ifdef FOSSIL_ENABLE_TCL
   482    496   LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
   483    497   else
................................................................................
   524    538   VERSION     = $(OBJDIR)/version.exe
   525    539   }
   526    540   
   527    541   writeln {
   528    542   all:	$(OBJDIR) $(APPNAME)
   529    543   
   530    544   $(OBJDIR)/fossil.o:	$(SRCDIR)/../win/fossil.rc
          545  +	cp $(SRCDIR)/../win/fossil.rc $(OBJDIR)
   531    546   	cp $(SRCDIR)/../win/fossil.ico $(OBJDIR)
   532         -	$(PREFIX)windres -I$(SRCDIR) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
          547  +	$(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
   533    548   
   534    549   install:	$(APPNAME)
   535    550   	mkdir -p $(INSTALLDIR)
   536    551   	mv $(APPNAME) $(INSTALLDIR)
   537    552   
   538    553   $(OBJDIR):
   539    554   	mkdir $(OBJDIR)

Changes to win/Makefile.mingw.

     4      4   # WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
     5      5   ##############################################################################
     6      6   #
     7      7   # This file is automatically generated.  Instead of editing this
     8      8   # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
     9      9   # to regenerate this file.
    10     10   #
    11         -# This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW/Mingw-w64.
           11  +# This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW or
           12  +# MinGW-w64.
    12     13   #
    13     14   
    14         -####
           15  +#### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
           16  +#    By default, this is an empty string (i.e. use the native compiler).
    15     17   #
    16         -# Select one of mingw, mingw-64 (32-bit) or mingw-w64 (64-bit)
    17         -#
    18         -PREFIX=i686-pc-mingw32-
    19         -#PREFIX=i686-w64-mingw32-
    20         -#PREFIX=x86_64-w64-mingw32-
           18  +PREFIX =
           19  +# PREFIX = i686-pc-mingw32-
           20  +# PREFIX = i686-w64-mingw32-
           21  +# PREFIX = x86_64-w64-mingw32-
    21     22   
    22     23   #### The toplevel directory of the source tree.  Fossil can be built
    23     24   #    in a directory that is separate from the source tree.  Just change
    24     25   #    the following to point from the build directory to the src/ folder.
    25     26   #
    26     27   SRCDIR = src
    27     28   
................................................................................
   102    103   #    will run on the target platform.  This is usually the same
   103    104   #    as BCC, unless you are cross-compiling.  This C compiler builds
   104    105   #    the finished binary for fossil.  The BCC compiler above is used
   105    106   #    for building intermediate code-generator tools.
   106    107   #
   107    108   TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
   108    109   
          110  +#### Compile resources for use in building executables that will run
          111  +#    on the target platform.
          112  +#
          113  +RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
          114  +
   109    115   # With HTTPS support
   110    116   ifdef FOSSIL_ENABLE_SSL
   111    117   TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
          118  +RCC += -I$(OPENSSLINCDIR)
   112    119   endif
   113    120   
   114    121   # With Tcl support
   115    122   ifdef FOSSIL_ENABLE_TCL
   116    123   ifdef FOSSIL_TCL_SOURCE
   117    124   TCC += -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
          125  +RCC += -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
   118    126   else
   119    127   TCC += -L$(TCLLIBDIR) -I$(TCLINCDIR)
          128  +RCC += -I$(TCLINCDIR)
   120    129   endif
   121    130   endif
   122    131   
   123    132   # With HTTPS support
   124    133   ifdef FOSSIL_ENABLE_SSL
   125    134   TCC += -DFOSSIL_ENABLE_SSL=1
          135  +RCC += -DFOSSIL_ENABLE_SSL=1
   126    136   endif
   127    137   
   128    138   # With Tcl support (statically linked)
   129    139   ifdef FOSSIL_ENABLE_TCL
   130    140   TCC += -DFOSSIL_ENABLE_TCL=1 -DSTATIC_BUILD
          141  +RCC += -DFOSSIL_ENABLE_TCL=1
   131    142   endif
   132    143   
   133    144   # With JSON support
   134    145   ifdef FOSSIL_ENABLE_JSON
   135    146   TCC += -DFOSSIL_ENABLE_JSON=1
          147  +RCC += -DFOSSIL_ENABLE_JSON=1
   136    148   endif
   137    149   
   138         -#### Extra arguments for linking the finished binary.  Fossil needs
   139         -#    to link against the Z-Lib compression library.  There are no
   140         -#    other mandatory dependencies.  We add the -static option here
   141         -#    so that we can build a static executable that will run in a
   142         -#    chroot jail.
          150  +#### We add the -static option here so that we can build a static
          151  +#    executable that will run in a chroot jail.
   143    152   #
   144    153   LIB = -static
   145         -LIB += -lmingwex -lz
   146    154   
   147    155   # OpenSSL: Add the necessary libraries required, if enabled.
   148    156   ifdef FOSSIL_ENABLE_SSL
   149    157   LIB += -lssl -lcrypto -lgdi32
   150    158   endif
   151    159   
   152    160   # Tcl: Add the necessary libraries required, if enabled.
   153    161   ifdef FOSSIL_ENABLE_TCL
   154    162   LIB += $(LIBTCL)
   155    163   endif
          164  +
          165  +#### Extra arguments for linking the finished binary.  Fossil needs
          166  +#    to link against the Z-Lib compression library.  There are no
          167  +#    other mandatory dependencies.
          168  +#
          169  +LIB += -lmingwex -lz
   156    170   
   157    171   #### These libraries MUST appear in the same order as they do for Tcl
   158    172   #    or linking with it will not work (exact reason unknown).
   159    173   #
   160    174   ifdef FOSSIL_ENABLE_TCL
   161    175   LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
   162    176   else
................................................................................
   489    503   
   490    504   
   491    505   all:	$(OBJDIR) $(APPNAME)
   492    506   
   493    507   $(OBJDIR)/fossil.o:	$(SRCDIR)/../win/fossil.rc
   494    508   	cp $(SRCDIR)/../win/fossil.rc $(OBJDIR)
   495    509   	cp $(SRCDIR)/../win/fossil.ico $(OBJDIR)
   496         -	$(PREFIX)windres -I$(SRCDIR) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
          510  +	$(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
   497    511   
   498    512   install:	$(APPNAME)
   499    513   	mkdir -p $(INSTALLDIR)
   500    514   	mv $(APPNAME) $(INSTALLDIR)
   501    515   
   502    516   $(OBJDIR):
   503    517   	mkdir $(OBJDIR)

Changes to win/Makefile.mingw.mistachkin.

     4      4   # WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
     5      5   ##############################################################################
     6      6   #
     7      7   # This file is automatically generated.  Instead of editing this
     8      8   # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
     9      9   # to regenerate this file.
    10     10   #
    11         -# This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW/Mingw-w64.
           11  +# This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW or
           12  +# MinGW-w64.
    12     13   #
    13     14   
    14         -####
           15  +#### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers.
           16  +#    By default, this is an empty string (i.e. use the native compiler).
    15     17   #
    16         -# Select one of mingw, mingw-64 (32-bit) or mingw-w64 (64-bit)
    17         -#
    18         -PREFIX=i686-pc-mingw32-
    19         -#PREFIX=i686-w64-mingw32-
    20         -#PREFIX=x86_64-w64-mingw32-
           18  +PREFIX =
           19  +# PREFIX = i686-pc-mingw32-
           20  +# PREFIX = i686-w64-mingw32-
           21  +# PREFIX = x86_64-w64-mingw32-
    21     22   
    22     23   #### The toplevel directory of the source tree.  Fossil can be built
    23     24   #    in a directory that is separate from the source tree.  Just change
    24     25   #    the following to point from the build directory to the src/ folder.
    25     26   #
    26     27   SRCDIR = src
    27     28   
................................................................................
   102    103   #    will run on the target platform.  This is usually the same
   103    104   #    as BCC, unless you are cross-compiling.  This C compiler builds
   104    105   #    the finished binary for fossil.  The BCC compiler above is used
   105    106   #    for building intermediate code-generator tools.
   106    107   #
   107    108   TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
   108    109   
          110  +#### Compile resources for use in building executables that will run
          111  +#    on the target platform.
          112  +#
          113  +RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
          114  +
   109    115   # With HTTPS support
   110    116   ifdef FOSSIL_ENABLE_SSL
   111    117   TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
          118  +RCC += -I$(OPENSSLINCDIR)
   112    119   endif
   113    120   
   114    121   # With Tcl support
   115    122   ifdef FOSSIL_ENABLE_TCL
   116    123   ifdef FOSSIL_TCL_SOURCE
   117    124   TCC += -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
          125  +RCC += -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
   118    126   else
   119    127   TCC += -L$(TCLLIBDIR) -I$(TCLINCDIR)
          128  +RCC += -I$(TCLINCDIR)
   120    129   endif
   121    130   endif
   122    131   
   123    132   # With HTTPS support
   124    133   ifdef FOSSIL_ENABLE_SSL
   125    134   TCC += -DFOSSIL_ENABLE_SSL=1
          135  +RCC += -DFOSSIL_ENABLE_SSL=1
   126    136   endif
   127    137   
   128    138   # With Tcl support (statically linked)
   129    139   ifdef FOSSIL_ENABLE_TCL
   130    140   TCC += -DFOSSIL_ENABLE_TCL=1 -DSTATIC_BUILD
          141  +RCC += -DFOSSIL_ENABLE_TCL=1
   131    142   endif
   132    143   
   133    144   # With JSON support
   134    145   ifdef FOSSIL_ENABLE_JSON
   135    146   TCC += -DFOSSIL_ENABLE_JSON=1
          147  +RCC += -DFOSSIL_ENABLE_JSON=1
   136    148   endif
   137    149   
   138         -#### Extra arguments for linking the finished binary.  Fossil needs
   139         -#    to link against the Z-Lib compression library.  There are no
   140         -#    other mandatory dependencies.  We add the -static option here
   141         -#    so that we can build a static executable that will run in a
   142         -#    chroot jail.
          150  +#### We add the -static option here so that we can build a static
          151  +#    executable that will run in a chroot jail.
   143    152   #
   144    153   LIB = -static
   145         -LIB += -lmingwex -lz
   146    154   
   147    155   # OpenSSL: Add the necessary libraries required, if enabled.
   148    156   ifdef FOSSIL_ENABLE_SSL
   149    157   LIB += -lssl -lcrypto -lgdi32
   150    158   endif
   151    159   
   152    160   # Tcl: Add the necessary libraries required, if enabled.
   153    161   ifdef FOSSIL_ENABLE_TCL
   154    162   LIB += $(LIBTCL)
   155    163   endif
          164  +
          165  +#### Extra arguments for linking the finished binary.  Fossil needs
          166  +#    to link against the Z-Lib compression library.  There are no
          167  +#    other mandatory dependencies.
          168  +#
          169  +LIB += -lmingwex -lz
   156    170   
   157    171   #### These libraries MUST appear in the same order as they do for Tcl
   158    172   #    or linking with it will not work (exact reason unknown).
   159    173   #
   160    174   ifdef FOSSIL_ENABLE_TCL
   161    175   LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
   162    176   else
................................................................................
   487    501   MKINDEX     = $(OBJDIR)/mkindex.exe
   488    502   VERSION     = $(OBJDIR)/version.exe
   489    503   
   490    504   
   491    505   all:	$(OBJDIR) $(APPNAME)
   492    506   
   493    507   $(OBJDIR)/fossil.o:	$(SRCDIR)/../win/fossil.rc
          508  +	cp $(SRCDIR)/../win/fossil.rc $(OBJDIR)
   494    509   	cp $(SRCDIR)/../win/fossil.ico $(OBJDIR)
   495         -	$(PREFIX)windres -I$(SRCDIR) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
          510  +	$(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
   496    511   
   497    512   install:	$(APPNAME)
   498    513   	mkdir -p $(INSTALLDIR)
   499    514   	mv $(APPNAME) $(INSTALLDIR)
   500    515   
   501    516   $(OBJDIR):
   502    517   	mkdir $(OBJDIR)

Changes to win/fossil.rc.

     1         -#include <windows.h>
            1  +/*
            2  +** Copyright (c) 2012 D. Richard Hipp
            3  +**
            4  +** This program is free software; you can redistribute it and/or
            5  +** modify it under the terms of the Simplified BSD License (also
            6  +** known as the "2-Clause License" or "FreeBSD License".)
            7  +
            8  +** This program is distributed in the hope that it will be useful,
            9  +** but without any warranty; without even the implied warranty of
           10  +** merchantability or fitness for a particular purpose.
           11  +**
           12  +** Author contact information:
           13  +**   drh@hwaci.com
           14  +**   http://www.hwaci.com/drh/
           15  +**
           16  +*******************************************************************************
           17  +**
           18  +** This file contains resource information for the executable on Windows.
           19  +*/
           20  +
           21  +#if !defined(_WIN32_WCE)
           22  +#include "winresrc.h"
           23  +#else
           24  +#include "windows.h"
           25  +#endif
           26  +
     2     27   #include "VERSION.h"
     3     28   #define _RC_COMPILE_
     4     29   #include "config.h"
           30  +#include "sqlite3.h"
           31  +#include "zlib.h"
           32  +
           33  +#ifdef FOSSIL_ENABLE_SSL
           34  +#include "openssl/opensslv.h"
           35  +#endif
           36  +
           37  +#ifdef FOSSIL_ENABLE_TCL
           38  +#include "tcl.h"
           39  +#endif
           40  +
           41  +/*
           42  + * English (U.S.) resources
           43  + */
           44  +
           45  +#ifdef _WIN32
           46  +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
           47  +#pragma code_page(1252)
           48  +#endif /* _WIN32 */
           49  +
           50  +/*
           51  + * Icon
           52  + */
           53  +
           54  +#define IDI_FOSSIL 8001
           55  +
           56  +IDI_FOSSIL ICON "fossil.ico"
     5     57   
     6         -LANGUAGE LANG_ENGLISH,SUBLANG_ENGLISH_US
           58  +/*
           59  + * Version
           60  + */
     7     61   
     8     62   VS_VERSION_INFO VERSIONINFO
     9         -FILEVERSION 1,0,0,0
    10         -PRODUCTVERSION 1,0,0,0
    11         -FILEFLAGSMASK 0x3F
    12         -FILEFLAGS 0x0
    13         -FILEOS VOS__WINDOWS32
    14         -FILETYPE VFT_APP
    15         -FILESUBTYPE VFT2_UNKNOWN
           63  +  FILEVERSION 1,0,0,0
           64  +  PRODUCTVERSION 1,0,0,0
           65  +  FILEFLAGSMASK 0x3F
           66  +#if defined(_DEBUG)
           67  +  FILEFLAGS 0x1L
           68  +#else
           69  +  FILEFLAGS 0x0L
           70  +#endif
           71  +  FILEOS VOS__WINDOWS32
           72  +  FILETYPE VFT_APP
           73  +  FILESUBTYPE VFT2_UNKNOWN
    16     74   BEGIN
    17     75     BLOCK "StringFileInfo"
    18     76     BEGIN
    19     77       BLOCK "040904B0"
    20     78       BEGIN
    21         -      VALUE "FileDescription", "distributed source code control system with integrated wiki and ticket-system\0"
    22         -      VALUE "Comments", "compiler: "COMPILER_NAME"\0"
    23         -      VALUE "FileVersion", MANIFEST_UUID"("COMPILER_NAME"\0"
           79  +      VALUE "CompanyName", "Fossil Development Team\0"
           80  +      VALUE "FileDescription", "Simple, high-reliability, distributed software configuration management system.\0"
           81  +      VALUE "ProductName", "Fossil\0"
           82  +      VALUE "ProductVersion", "Fossil " RELEASE_VERSION " " MANIFEST_VERSION " " MANIFEST_DATE " UTC\0"
           83  +      VALUE "FileVersion", "Fossil " RELEASE_VERSION " " MANIFEST_VERSION " " MANIFEST_DATE " UTC\0"
    24     84         VALUE "InternalName", "fossil\0"
    25         -      VALUE "LegalCopyright", "Copyright (c) "MANIFEST_YEAR" D. Richard Hipp\0"
           85  +      VALUE "LegalCopyright", "Copyright � " MANIFEST_YEAR " by D. Richard Hipp.  All rights reserved.\0"
    26     86         VALUE "OriginalFilename", "fossil.exe\0"
    27         -      VALUE "ProductName", "fossil\0"
    28         -      VALUE "ProductVersion", MANIFEST_VERSION" "MANIFEST_DATE" UTC\0"
           87  +      VALUE "Compiler", COMPILER_NAME "\0"
           88  +      VALUE "SQLiteVersion", "SQLite " SQLITE_VERSION " " SQLITE_SOURCE_ID "\0"
           89  +      VALUE "ZlibVersion", "zlib " ZLIB_VERSION "\0"
           90  +#ifdef FOSSIL_ENABLE_SSL
           91  +      VALUE "SslEnabled", "Yes, " OPENSSL_VERSION_TEXT "\0"
           92  +#endif
           93  +#ifdef FOSSIL_ENABLE_TCL
           94  +      VALUE "TclEnabled", "Yes, Tcl " TCL_PATCH_LEVEL "\0"
           95  +#endif
           96  +#ifdef FOSSIL_ENABLE_JSON
           97  +      VALUE "JsonEnabled", "Yes, cson\0"
           98  +#endif
    29     99       END
    30    100     END
    31    101     BLOCK "VarFileInfo"
    32    102     BEGIN
    33    103       VALUE "Translation", 0x409, 0x4B0
    34    104     END
    35    105   END
    36         -
    37         -8001 ICON "fossil.ico"
    38         -