Fossil

Check-in [5253e0a7]
Login

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

Overview
Comment:Merge in the mingw build enhancements.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:5253e0a79141e4810b0e53701a69bfe71960bb02
User & Date: drh 2012-08-23 21:18:51
Context
2012-08-24
05:56
One more minor Win32 resource tweak. check-in: 02bff595 user: mistachkin tags: trunk
2012-08-23
21:18
Merge in the mingw build enhancements. check-in: 5253e0a7 user: drh tags: trunk
21:15
Fix an off-by-one error in the version-3 clone protocol. This error might cause an incomplete and corrupt clone if a transfer block fills up just before sending the very last blob. check-in: 0db6f981 user: drh tags: trunk
14:29
... and the makemake.tcl corresponding changes as well Closed-Leaf check-in: e55c7139 user: jan.nijtmans tags: better-mingw-v2
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

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 us on windows using MinGW.
          332  +# This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW or
          333  +# MinGW-w64.
   333    334   #
          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).
          338  +#
          339  +PREFIX =
          340  +# PREFIX = i686-pc-mingw32-
          341  +# PREFIX = i686-w64-mingw32-
          342  +# PREFIX = x86_64-w64-mingw32-
          343  +
   334    344   #### The toplevel directory of the source tree.  Fossil can be built
   335    345   #    in a directory that is separate from the source tree.  Just change
   336    346   #    the following to point from the build directory to the src/ folder.
   337    347   #
   338    348   SRCDIR = src
   339    349   
   340    350   #### The directory into which object code files should be written.
................................................................................
   412    422   
   413    423   #### C Compile and options for use in building executables that
   414    424   #    will run on the target platform.  This is usually the same
   415    425   #    as BCC, unless you are cross-compiling.  This C compiler builds
   416    426   #    the finished binary for fossil.  The BCC compiler above is used
   417    427   #    for building intermediate code-generator tools.
   418    428   #
   419         -TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
          429  +TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
          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)
   420    435   
   421    436   # With HTTPS support
   422    437   ifdef FOSSIL_ENABLE_SSL
   423    438   TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
          439  +RCC += -I$(OPENSSLINCDIR)
   424    440   endif
   425    441   
   426    442   # With Tcl support
   427    443   ifdef FOSSIL_ENABLE_TCL
   428    444   ifdef FOSSIL_TCL_SOURCE
   429    445   TCC += -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
          446  +RCC += -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
   430    447   else
   431    448   TCC += -L$(TCLLIBDIR) -I$(TCLINCDIR)
          449  +RCC += -I$(TCLINCDIR)
   432    450   endif
   433    451   endif
   434    452   
   435    453   # With HTTPS support
   436    454   ifdef FOSSIL_ENABLE_SSL
   437    455   TCC += -DFOSSIL_ENABLE_SSL=1
          456  +RCC += -DFOSSIL_ENABLE_SSL=1
   438    457   endif
   439    458   
   440    459   # With Tcl support (statically linked)
   441    460   ifdef FOSSIL_ENABLE_TCL
   442    461   TCC += -DFOSSIL_ENABLE_TCL=1 -DSTATIC_BUILD
          462  +RCC += -DFOSSIL_ENABLE_TCL=1
   443    463   endif
   444    464   
   445    465   # With JSON support
   446    466   ifdef FOSSIL_ENABLE_JSON
   447    467   TCC += -DFOSSIL_ENABLE_JSON=1
          468  +RCC += -DFOSSIL_ENABLE_JSON=1
   448    469   endif
   449    470   
   450         -#### Extra arguments for linking the finished binary.  Fossil needs
   451         -#    to link against the Z-Lib compression library.  There are no
   452         -#    other mandatory dependencies.  We add the -static option here
   453         -#    so that we can build a static executable that will run in a
   454         -#    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.
   455    473   #
   456    474   LIB = -static
   457         -LIB += -lmingwex -lz
   458    475   
   459    476   # OpenSSL: Add the necessary libraries required, if enabled.
   460    477   ifdef FOSSIL_ENABLE_SSL
   461    478   LIB += -lssl -lcrypto -lgdi32
   462    479   endif
   463    480   
   464    481   # Tcl: Add the necessary libraries required, if enabled.
   465    482   ifdef FOSSIL_ENABLE_TCL
   466    483   LIB += $(LIBTCL)
   467    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
   468    491   
   469    492   #### These libraries MUST appear in the same order as they do for Tcl
   470    493   #    or linking with it will not work (exact reason unknown).
   471    494   #
   472    495   ifdef FOSSIL_ENABLE_TCL
   473    496   LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
   474    497   else
................................................................................
   514    537   MKINDEX     = $(OBJDIR)/mkindex.exe
   515    538   VERSION     = $(OBJDIR)/version.exe
   516    539   }
   517    540   
   518    541   writeln {
   519    542   all:	$(OBJDIR) $(APPNAME)
   520    543   
   521         -$(OBJDIR)/icon.o:	$(SRCDIR)/../win/icon.rc
   522         -	cp $(SRCDIR)/../win/icon.rc $(OBJDIR)
   523         -	windres $(OBJDIR)/icon.rc -o $(OBJDIR)/icon.o
          544  +$(OBJDIR)/fossil.o:	$(SRCDIR)/../win/fossil.rc
          545  +	cp $(SRCDIR)/../win/fossil.rc $(OBJDIR)
          546  +	cp $(SRCDIR)/../win/fossil.ico $(OBJDIR)
          547  +	$(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
   524    548   
   525    549   install:	$(APPNAME)
   526    550   	mkdir -p $(INSTALLDIR)
   527    551   	mv $(APPNAME) $(INSTALLDIR)
   528    552   
   529    553   $(OBJDIR):
   530    554   	mkdir $(OBJDIR)
................................................................................
   557    581     $(OBJDIR)/th_lang.o \
   558    582     $(OBJDIR)/cson_amalgamation.o
   559    583   
   560    584   ifdef FOSSIL_ENABLE_TCL
   561    585   EXTRAOBJ +=  $(OBJDIR)/th_tcl.o
   562    586   endif
   563    587   
   564         -$(APPNAME):	$(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o
   565         -	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o
          588  +$(APPNAME):	$(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o
          589  +	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
   566    590   
   567    591   # This rule prevents make from using its default rules to try build
   568    592   # an executable named "manifest" out of the file named "manifest.c"
   569    593   #
   570    594   $(SRCDIR)/../manifest:
   571    595   	# noop
   572    596   

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 us on windows using MinGW.
           11  +# This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW or
           12  +# MinGW-w64.
    12     13   #
           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).
           17  +#
           18  +PREFIX =
           19  +# PREFIX = i686-pc-mingw32-
           20  +# PREFIX = i686-w64-mingw32-
           21  +# PREFIX = x86_64-w64-mingw32-
           22  +
    13     23   #### The toplevel directory of the source tree.  Fossil can be built
    14     24   #    in a directory that is separate from the source tree.  Just change
    15     25   #    the following to point from the build directory to the src/ folder.
    16     26   #
    17     27   SRCDIR = src
    18     28   
    19     29   #### The directory into which object code files should be written.
................................................................................
    91    101   
    92    102   #### C Compile and options for use in building executables that
    93    103   #    will run on the target platform.  This is usually the same
    94    104   #    as BCC, unless you are cross-compiling.  This C compiler builds
    95    105   #    the finished binary for fossil.  The BCC compiler above is used
    96    106   #    for building intermediate code-generator tools.
    97    107   #
    98         -TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
          108  +TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
          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)
    99    114   
   100    115   # With HTTPS support
   101    116   ifdef FOSSIL_ENABLE_SSL
   102    117   TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
          118  +RCC += -I$(OPENSSLINCDIR)
   103    119   endif
   104    120   
   105    121   # With Tcl support
   106    122   ifdef FOSSIL_ENABLE_TCL
   107    123   ifdef FOSSIL_TCL_SOURCE
   108    124   TCC += -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
          125  +RCC += -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
   109    126   else
   110    127   TCC += -L$(TCLLIBDIR) -I$(TCLINCDIR)
          128  +RCC += -I$(TCLINCDIR)
   111    129   endif
   112    130   endif
   113    131   
   114    132   # With HTTPS support
   115    133   ifdef FOSSIL_ENABLE_SSL
   116    134   TCC += -DFOSSIL_ENABLE_SSL=1
          135  +RCC += -DFOSSIL_ENABLE_SSL=1
   117    136   endif
   118    137   
   119    138   # With Tcl support (statically linked)
   120    139   ifdef FOSSIL_ENABLE_TCL
   121    140   TCC += -DFOSSIL_ENABLE_TCL=1 -DSTATIC_BUILD
          141  +RCC += -DFOSSIL_ENABLE_TCL=1
   122    142   endif
   123    143   
   124    144   # With JSON support
   125    145   ifdef FOSSIL_ENABLE_JSON
   126    146   TCC += -DFOSSIL_ENABLE_JSON=1
          147  +RCC += -DFOSSIL_ENABLE_JSON=1
   127    148   endif
   128    149   
   129         -#### Extra arguments for linking the finished binary.  Fossil needs
   130         -#    to link against the Z-Lib compression library.  There are no
   131         -#    other mandatory dependencies.  We add the -static option here
   132         -#    so that we can build a static executable that will run in a
   133         -#    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.
   134    152   #
   135    153   LIB = -static
   136         -LIB += -lmingwex -lz
   137    154   
   138    155   # OpenSSL: Add the necessary libraries required, if enabled.
   139    156   ifdef FOSSIL_ENABLE_SSL
   140    157   LIB += -lssl -lcrypto -lgdi32
   141    158   endif
   142    159   
   143    160   # Tcl: Add the necessary libraries required, if enabled.
   144    161   ifdef FOSSIL_ENABLE_TCL
   145    162   LIB += $(LIBTCL)
   146    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
   147    170   
   148    171   #### These libraries MUST appear in the same order as they do for Tcl
   149    172   #    or linking with it will not work (exact reason unknown).
   150    173   #
   151    174   ifdef FOSSIL_ENABLE_TCL
   152    175   LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
   153    176   else
................................................................................
   477    500   MAKEHEADERS = $(OBJDIR)/makeheaders.exe
   478    501   MKINDEX     = $(OBJDIR)/mkindex.exe
   479    502   VERSION     = $(OBJDIR)/version.exe
   480    503   
   481    504   
   482    505   all:	$(OBJDIR) $(APPNAME)
   483    506   
   484         -$(OBJDIR)/icon.o:	$(SRCDIR)/../win/icon.rc
   485         -	cp $(SRCDIR)/../win/icon.rc $(OBJDIR)
   486         -	windres $(OBJDIR)/icon.rc -o $(OBJDIR)/icon.o
          507  +$(OBJDIR)/fossil.o:	$(SRCDIR)/../win/fossil.rc
          508  +	cp $(SRCDIR)/../win/fossil.rc $(OBJDIR)
          509  +	cp $(SRCDIR)/../win/fossil.ico $(OBJDIR)
          510  +	$(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
   487    511   
   488    512   install:	$(APPNAME)
   489    513   	mkdir -p $(INSTALLDIR)
   490    514   	mv $(APPNAME) $(INSTALLDIR)
   491    515   
   492    516   $(OBJDIR):
   493    517   	mkdir $(OBJDIR)
................................................................................
   515    539   
   516    540   EXTRAOBJ =  $(OBJDIR)/sqlite3.o  $(OBJDIR)/shell.o  $(OBJDIR)/th.o  $(OBJDIR)/th_lang.o  $(OBJDIR)/cson_amalgamation.o
   517    541   
   518    542   ifdef FOSSIL_ENABLE_TCL
   519    543   EXTRAOBJ +=  $(OBJDIR)/th_tcl.o
   520    544   endif
   521    545   
   522         -$(APPNAME):	$(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o
   523         -	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o
          546  +$(APPNAME):	$(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o
          547  +	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
   524    548   
   525    549   # This rule prevents make from using its default rules to try build
   526    550   # an executable named "manifest" out of the file named "manifest.c"
   527    551   #
   528    552   $(SRCDIR)/../manifest:
   529    553   	# noop
   530    554   

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 us on windows using MinGW.
           11  +# This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW or
           12  +# MinGW-w64.
    12     13   #
           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).
           17  +#
           18  +PREFIX =
           19  +# PREFIX = i686-pc-mingw32-
           20  +# PREFIX = i686-w64-mingw32-
           21  +# PREFIX = x86_64-w64-mingw32-
           22  +
    13     23   #### The toplevel directory of the source tree.  Fossil can be built
    14     24   #    in a directory that is separate from the source tree.  Just change
    15     25   #    the following to point from the build directory to the src/ folder.
    16     26   #
    17     27   SRCDIR = src
    18     28   
    19     29   #### The directory into which object code files should be written.
................................................................................
    91    101   
    92    102   #### C Compile and options for use in building executables that
    93    103   #    will run on the target platform.  This is usually the same
    94    104   #    as BCC, unless you are cross-compiling.  This C compiler builds
    95    105   #    the finished binary for fossil.  The BCC compiler above is used
    96    106   #    for building intermediate code-generator tools.
    97    107   #
    98         -TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
          108  +TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
          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)
    99    114   
   100    115   # With HTTPS support
   101    116   ifdef FOSSIL_ENABLE_SSL
   102    117   TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
          118  +RCC += -I$(OPENSSLINCDIR)
   103    119   endif
   104    120   
   105    121   # With Tcl support
   106    122   ifdef FOSSIL_ENABLE_TCL
   107    123   ifdef FOSSIL_TCL_SOURCE
   108    124   TCC += -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
          125  +RCC += -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
   109    126   else
   110    127   TCC += -L$(TCLLIBDIR) -I$(TCLINCDIR)
          128  +RCC += -I$(TCLINCDIR)
   111    129   endif
   112    130   endif
   113    131   
   114    132   # With HTTPS support
   115    133   ifdef FOSSIL_ENABLE_SSL
   116    134   TCC += -DFOSSIL_ENABLE_SSL=1
          135  +RCC += -DFOSSIL_ENABLE_SSL=1
   117    136   endif
   118    137   
   119    138   # With Tcl support (statically linked)
   120    139   ifdef FOSSIL_ENABLE_TCL
   121    140   TCC += -DFOSSIL_ENABLE_TCL=1 -DSTATIC_BUILD
          141  +RCC += -DFOSSIL_ENABLE_TCL=1
   122    142   endif
   123    143   
   124    144   # With JSON support
   125    145   ifdef FOSSIL_ENABLE_JSON
   126    146   TCC += -DFOSSIL_ENABLE_JSON=1
          147  +RCC += -DFOSSIL_ENABLE_JSON=1
   127    148   endif
   128    149   
   129         -#### Extra arguments for linking the finished binary.  Fossil needs
   130         -#    to link against the Z-Lib compression library.  There are no
   131         -#    other mandatory dependencies.  We add the -static option here
   132         -#    so that we can build a static executable that will run in a
   133         -#    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.
   134    152   #
   135    153   LIB = -static
   136         -LIB += -lmingwex -lz
   137    154   
   138         -# OpenSSL: Add the necessary libaries required, if enabled.
          155  +# OpenSSL: Add the necessary libraries required, if enabled.
   139    156   ifdef FOSSIL_ENABLE_SSL
   140    157   LIB += -lssl -lcrypto -lgdi32
   141    158   endif
   142    159   
   143         -# Tcl: Add the necessary libaries required, if enabled.
          160  +# Tcl: Add the necessary libraries required, if enabled.
   144    161   ifdef FOSSIL_ENABLE_TCL
   145    162   LIB += $(LIBTCL)
   146    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
   147    170   
   148    171   #### These libraries MUST appear in the same order as they do for Tcl
   149    172   #    or linking with it will not work (exact reason unknown).
   150    173   #
   151    174   ifdef FOSSIL_ENABLE_TCL
   152    175   LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
   153    176   else
................................................................................
   477    500   MAKEHEADERS = $(OBJDIR)/makeheaders.exe
   478    501   MKINDEX     = $(OBJDIR)/mkindex.exe
   479    502   VERSION     = $(OBJDIR)/version.exe
   480    503   
   481    504   
   482    505   all:	$(OBJDIR) $(APPNAME)
   483    506   
   484         -$(OBJDIR)/icon.o:	$(SRCDIR)/../win/icon.rc
   485         -	cp $(SRCDIR)/../win/icon.rc $(OBJDIR)
   486         -	windres $(OBJDIR)/icon.rc -o $(OBJDIR)/icon.o
          507  +$(OBJDIR)/fossil.o:	$(SRCDIR)/../win/fossil.rc
          508  +	cp $(SRCDIR)/../win/fossil.rc $(OBJDIR)
          509  +	cp $(SRCDIR)/../win/fossil.ico $(OBJDIR)
          510  +	$(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
   487    511   
   488    512   install:	$(APPNAME)
   489    513   	mkdir -p $(INSTALLDIR)
   490    514   	mv $(APPNAME) $(INSTALLDIR)
   491    515   
   492    516   $(OBJDIR):
   493    517   	mkdir $(OBJDIR)
................................................................................
   515    539   
   516    540   EXTRAOBJ =  $(OBJDIR)/sqlite3.o  $(OBJDIR)/shell.o  $(OBJDIR)/th.o  $(OBJDIR)/th_lang.o  $(OBJDIR)/cson_amalgamation.o
   517    541   
   518    542   ifdef FOSSIL_ENABLE_TCL
   519    543   EXTRAOBJ +=  $(OBJDIR)/th_tcl.o
   520    544   endif
   521    545   
   522         -$(APPNAME):	$(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o
   523         -	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o
          546  +$(APPNAME):	$(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o
          547  +	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
   524    548   
   525    549   # This rule prevents make from using its default rules to try build
   526    550   # an executable named "manifest" out of the file named "manifest.c"
   527    551   #
   528    552   $(SRCDIR)/../manifest:
   529    553   	# noop
   530    554   

Deleted win/Makefile.mingw32cross.

     1         -#!/usr/bin/make
     2         -# This makefile is for use with the Mingw32 *cross compiler* on Linux
     3         -#
     4         -#### The toplevel directory of the source tree.  Fossil can be built
     5         -#    in a directory that is separate from the source tree.  Just change
     6         -#    the following to point from the build directory to the src/ folder.
     7         -#
     8         -SRCDIR = ./src
     9         -OBJDIR = ./wobj
    10         -
    11         -#### C Compiler and options for use in building executables that
    12         -#    will run on the platform that is doing the build.  This is used
    13         -#    to compile code-generator programs as part of the build process.
    14         -#    See TCC below for the C compiler for building the finished binary.
    15         -#
    16         -BCC = gcc -s -O2
    17         -
    18         -#### The suffix to add to executable files.  ".exe" for windows.
    19         -#    Nothing for unix.
    20         -#
    21         -E = .exe
    22         -
    23         -#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
    24         -#
    25         -FOSSIL_ENABLE_SSL=1
    26         -
    27         -#### C Compile and options for use in building executables that 
    28         -#    will run on the target platform.  This is usually the same
    29         -#    as BCC, unless you are cross-compiling.  This C compiler builds
    30         -#    the finished binary for fossil.  The BCC compiler above is used
    31         -#    for building intermediate code-generator tools.
    32         -#
    33         -#TCC = gcc -O6
    34         -#TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage
    35         -#TCC = gcc -g -Os -Wall
    36         -#TCC = gcc -g -Os -Wall -DFOSSIL_I18N=0 -L/usr/local/lib -I/usr/local/include
    37         -TCC=i686-pc-mingw32-gcc -O3 -s -Wall -DFOSSIL_I18N=0
    38         -
    39         -# With HTTPS support
    40         -ifdef FOSSIL_ENABLE_SSL
    41         -TCC += -DFOSSIL_ENABLE_SSL=1
    42         -endif
    43         -
    44         -#### Extra arguments for linking the finished binary.  Fossil needs
    45         -#    to link against the Z-Lib compression library.  There are no
    46         -#    other dependencies.  We sometimes add the -static option here
    47         -#    so that we can build a static executable that will run in a
    48         -#    chroot jail.
    49         -#
    50         -LIB=-lz -lssl -lcrypto -lwsock32 -lgdi32
    51         -CFLAGS=-O3 -s
    52         -LDFLAGS=-s
    53         -
    54         -#### Tcl shell for use in running the fossil testsuite.
    55         -#
    56         -TCLSH = tclsh
    57         -
    58         -#### Include a configuration file that can override any one of these settings.
    59         -#
    60         --include config.w32
    61         -
    62         -# You should not need to change anything below this line
    63         -###############################################################################
    64         -include $(SRCDIR)/main.mk

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         -

Deleted win/icon.rc.

     1         -ID ICON "../win/fossil.ico"