Fossil SCM
Building with mingw32-make fixes from Edward Berner. Mention "FreeBSD" as well, as possible build platform.
Commit
28c3674785a39d29b7d0a88f062c0a3051b28035
Parent
0421c136f2979dd…
3 files changed
+4
-4
+4
-4
+5
-5
+4
-4
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -340,15 +340,15 @@ | ||
| 340 | 340 | # |
| 341 | 341 | # This file is automatically generated. Instead of editing this |
| 342 | 342 | # file, edit "makemake.tcl" then run "tclsh makemake.tcl" |
| 343 | 343 | # to regenerate this file. |
| 344 | 344 | # |
| 345 | -# This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW or | |
| 346 | -# MinGW-w64. | |
| 345 | +# This is a makefile for use on Cygwin/Darwin/FreeBSD/Linux/Windows using | |
| 346 | +# MinGW or MinGW-w64. | |
| 347 | 347 | # |
| 348 | 348 | |
| 349 | -#### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers. | |
| 349 | +#### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers. | |
| 350 | 350 | # By default, this is an empty string (i.e. use the native compiler). |
| 351 | 351 | # |
| 352 | 352 | PREFIX = |
| 353 | 353 | # PREFIX = mingw32- |
| 354 | 354 | # PREFIX = i686-pc-mingw32- |
| @@ -694,11 +694,11 @@ | ||
| 694 | 694 | ifdef FOSSIL_ENABLE_TCL |
| 695 | 695 | EXTRAOBJ += $(OBJDIR)/th_tcl.o |
| 696 | 696 | endif |
| 697 | 697 | |
| 698 | 698 | zlib: |
| 699 | - make -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a | |
| 699 | + $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a | |
| 700 | 700 | |
| 701 | 701 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 702 | 702 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 703 | 703 | |
| 704 | 704 | # This rule prevents make from using its default rules to try build |
| 705 | 705 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -340,15 +340,15 @@ | |
| 340 | # |
| 341 | # This file is automatically generated. Instead of editing this |
| 342 | # file, edit "makemake.tcl" then run "tclsh makemake.tcl" |
| 343 | # to regenerate this file. |
| 344 | # |
| 345 | # This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW or |
| 346 | # MinGW-w64. |
| 347 | # |
| 348 | |
| 349 | #### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers. |
| 350 | # By default, this is an empty string (i.e. use the native compiler). |
| 351 | # |
| 352 | PREFIX = |
| 353 | # PREFIX = mingw32- |
| 354 | # PREFIX = i686-pc-mingw32- |
| @@ -694,11 +694,11 @@ | |
| 694 | ifdef FOSSIL_ENABLE_TCL |
| 695 | EXTRAOBJ += $(OBJDIR)/th_tcl.o |
| 696 | endif |
| 697 | |
| 698 | zlib: |
| 699 | make -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a |
| 700 | |
| 701 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 702 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 703 | |
| 704 | # This rule prevents make from using its default rules to try build |
| 705 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -340,15 +340,15 @@ | |
| 340 | # |
| 341 | # This file is automatically generated. Instead of editing this |
| 342 | # file, edit "makemake.tcl" then run "tclsh makemake.tcl" |
| 343 | # to regenerate this file. |
| 344 | # |
| 345 | # This is a makefile for use on Cygwin/Darwin/FreeBSD/Linux/Windows using |
| 346 | # MinGW or MinGW-w64. |
| 347 | # |
| 348 | |
| 349 | #### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers. |
| 350 | # By default, this is an empty string (i.e. use the native compiler). |
| 351 | # |
| 352 | PREFIX = |
| 353 | # PREFIX = mingw32- |
| 354 | # PREFIX = i686-pc-mingw32- |
| @@ -694,11 +694,11 @@ | |
| 694 | ifdef FOSSIL_ENABLE_TCL |
| 695 | EXTRAOBJ += $(OBJDIR)/th_tcl.o |
| 696 | endif |
| 697 | |
| 698 | zlib: |
| 699 | $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a |
| 700 | |
| 701 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 702 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 703 | |
| 704 | # This rule prevents make from using its default rules to try build |
| 705 |
+4
-4
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -6,15 +6,15 @@ | ||
| 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 or | |
| 12 | -# MinGW-w64. | |
| 11 | +# This is a makefile for use on Cygwin/Darwin/FreeBSD/Linux/Windows using | |
| 12 | +# MinGW or MinGW-w64. | |
| 13 | 13 | # |
| 14 | 14 | |
| 15 | -#### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers. | |
| 15 | +#### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers. | |
| 16 | 16 | # By default, this is an empty string (i.e. use the native compiler). |
| 17 | 17 | # |
| 18 | 18 | PREFIX = |
| 19 | 19 | # PREFIX = mingw32- |
| 20 | 20 | # PREFIX = i686-pc-mingw32- |
| @@ -657,11 +657,11 @@ | ||
| 657 | 657 | ifdef FOSSIL_ENABLE_TCL |
| 658 | 658 | EXTRAOBJ += $(OBJDIR)/th_tcl.o |
| 659 | 659 | endif |
| 660 | 660 | |
| 661 | 661 | zlib: |
| 662 | - make -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a | |
| 662 | + $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a | |
| 663 | 663 | |
| 664 | 664 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 665 | 665 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 666 | 666 | |
| 667 | 667 | # This rule prevents make from using its default rules to try build |
| 668 | 668 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -6,15 +6,15 @@ | |
| 6 | # |
| 7 | # This file is automatically generated. Instead of editing this |
| 8 | # file, edit "makemake.tcl" then run "tclsh makemake.tcl" |
| 9 | # to regenerate this file. |
| 10 | # |
| 11 | # This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW or |
| 12 | # MinGW-w64. |
| 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 = mingw32- |
| 20 | # PREFIX = i686-pc-mingw32- |
| @@ -657,11 +657,11 @@ | |
| 657 | ifdef FOSSIL_ENABLE_TCL |
| 658 | EXTRAOBJ += $(OBJDIR)/th_tcl.o |
| 659 | endif |
| 660 | |
| 661 | zlib: |
| 662 | make -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a |
| 663 | |
| 664 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 665 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 666 | |
| 667 | # This rule prevents make from using its default rules to try build |
| 668 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -6,15 +6,15 @@ | |
| 6 | # |
| 7 | # This file is automatically generated. Instead of editing this |
| 8 | # file, edit "makemake.tcl" then run "tclsh makemake.tcl" |
| 9 | # to regenerate this file. |
| 10 | # |
| 11 | # This is a makefile for use on Cygwin/Darwin/FreeBSD/Linux/Windows using |
| 12 | # MinGW or MinGW-w64. |
| 13 | # |
| 14 | |
| 15 | #### Select one of MinGW, MinGW-w64 (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 = mingw32- |
| 20 | # PREFIX = i686-pc-mingw32- |
| @@ -657,11 +657,11 @@ | |
| 657 | ifdef FOSSIL_ENABLE_TCL |
| 658 | EXTRAOBJ += $(OBJDIR)/th_tcl.o |
| 659 | endif |
| 660 | |
| 661 | zlib: |
| 662 | $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a |
| 663 | |
| 664 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 665 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 666 | |
| 667 | # This rule prevents make from using its default rules to try build |
| 668 |
+5
-5
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -6,15 +6,15 @@ | ||
| 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 or | |
| 12 | -# MinGW-w64. | |
| 11 | +# This is a makefile for use on Cygwin/Darwin/FreeBSD/Linux/Windows using | |
| 12 | +# MinGW or MinGW-w64. | |
| 13 | 13 | # |
| 14 | 14 | |
| 15 | -#### Select one of MinGW, MinGW-64 (32-bit) or MinGW-w64 (64-bit) compilers. | |
| 15 | +#### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers. | |
| 16 | 16 | # By default, this is an empty string (i.e. use the native compiler). |
| 17 | 17 | # |
| 18 | 18 | PREFIX = |
| 19 | 19 | # PREFIX = mingw32- |
| 20 | 20 | # PREFIX = i686-pc-mingw32- |
| @@ -657,11 +657,11 @@ | ||
| 657 | 657 | ifdef FOSSIL_ENABLE_TCL |
| 658 | 658 | EXTRAOBJ += $(OBJDIR)/th_tcl.o |
| 659 | 659 | endif |
| 660 | 660 | |
| 661 | 661 | zlib: |
| 662 | - make -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a | |
| 662 | + $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a | |
| 663 | 663 | |
| 664 | 664 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 665 | 665 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 666 | 666 | |
| 667 | 667 | # This rule prevents make from using its default rules to try build |
| @@ -1633,11 +1633,11 @@ | ||
| 1633 | 1633 | |
| 1634 | 1634 | $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c |
| 1635 | 1635 | $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o |
| 1636 | 1636 | |
| 1637 | 1637 | $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c |
| 1638 | - $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE | |
| 1638 | + $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o | |
| 1639 | 1639 | |
| 1640 | 1640 | $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h |
| 1641 | 1641 | |
| 1642 | 1642 | $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h |
| 1643 | 1643 | $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o |
| 1644 | 1644 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -6,15 +6,15 @@ | |
| 6 | # |
| 7 | # This file is automatically generated. Instead of editing this |
| 8 | # file, edit "makemake.tcl" then run "tclsh makemake.tcl" |
| 9 | # to regenerate this file. |
| 10 | # |
| 11 | # This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW or |
| 12 | # MinGW-w64. |
| 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 = mingw32- |
| 20 | # PREFIX = i686-pc-mingw32- |
| @@ -657,11 +657,11 @@ | |
| 657 | ifdef FOSSIL_ENABLE_TCL |
| 658 | EXTRAOBJ += $(OBJDIR)/th_tcl.o |
| 659 | endif |
| 660 | |
| 661 | zlib: |
| 662 | make -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a |
| 663 | |
| 664 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 665 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 666 | |
| 667 | # This rule prevents make from using its default rules to try build |
| @@ -1633,11 +1633,11 @@ | |
| 1633 | |
| 1634 | $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c |
| 1635 | $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o |
| 1636 | |
| 1637 | $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c |
| 1638 | $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE |
| 1639 | |
| 1640 | $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h |
| 1641 | |
| 1642 | $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h |
| 1643 | $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o |
| 1644 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -6,15 +6,15 @@ | |
| 6 | # |
| 7 | # This file is automatically generated. Instead of editing this |
| 8 | # file, edit "makemake.tcl" then run "tclsh makemake.tcl" |
| 9 | # to regenerate this file. |
| 10 | # |
| 11 | # This is a makefile for use on Cygwin/Darwin/FreeBSD/Linux/Windows using |
| 12 | # MinGW or MinGW-w64. |
| 13 | # |
| 14 | |
| 15 | #### Select one of MinGW, MinGW-w64 (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 = mingw32- |
| 20 | # PREFIX = i686-pc-mingw32- |
| @@ -657,11 +657,11 @@ | |
| 657 | ifdef FOSSIL_ENABLE_TCL |
| 658 | EXTRAOBJ += $(OBJDIR)/th_tcl.o |
| 659 | endif |
| 660 | |
| 661 | zlib: |
| 662 | $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a |
| 663 | |
| 664 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 665 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 666 | |
| 667 | # This rule prevents make from using its default rules to try build |
| @@ -1633,11 +1633,11 @@ | |
| 1633 | |
| 1634 | $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c |
| 1635 | $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o |
| 1636 | |
| 1637 | $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c |
| 1638 | $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o |
| 1639 | |
| 1640 | $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h |
| 1641 | |
| 1642 | $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h |
| 1643 | $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o |
| 1644 |