Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch better-mingw Excluding Merge-Ins
This is equivalent to a diff from 4e66a96946 to cc2aa92ef8
2012-08-23
| ||
20:56 | Detect infinite loops in the DELTA table and abort out of content_get() when they are found. check-in: 791fd2fd68 user: drh tags: trunk | |
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 | |
2012-08-22
| ||
21:30 | two minor typos check-in: 544c163551 user: jan.nijtmans tags: trunk | |
Changes to src/makemake.tcl.
325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 ... 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 ... 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 ... 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 |
# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl") ############################################################################## # # This file is automatically generated. Instead of editing this # file, edit "makemake.tcl" then run "tclsh makemake.tcl" # to regenerate this file. # # This is a makefile for us on windows using MinGW. # #### The toplevel directory of the source tree. Fossil can be built # in a directory that is separate from the source tree. Just change # the following to point from the build directory to the src/ folder. # SRCDIR = src #### The directory into which object code files should be written. ................................................................................ #### C Compile and options for use in building executables that # will run on the target platform. This is usually the same # as BCC, unless you are cross-compiling. This C compiler builds # the finished binary for fossil. The BCC compiler above is used # for building intermediate code-generator tools. # TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR) # With HTTPS support ifdef FOSSIL_ENABLE_SSL TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR) endif # With Tcl support ................................................................................ MKINDEX = $(OBJDIR)/mkindex.exe VERSION = $(OBJDIR)/version.exe } writeln { all: $(OBJDIR) $(APPNAME) $(OBJDIR)/icon.o: $(SRCDIR)/../win/icon.rc cp $(SRCDIR)/../win/icon.rc $(OBJDIR) windres $(OBJDIR)/icon.rc -o $(OBJDIR)/icon.o install: $(APPNAME) mkdir -p $(INSTALLDIR) mv $(APPNAME) $(INSTALLDIR) $(OBJDIR): mkdir $(OBJDIR) ................................................................................ $(OBJDIR)/th_lang.o \ $(OBJDIR)/cson_amalgamation.o ifdef FOSSIL_ENABLE_TCL EXTRAOBJ += $(OBJDIR)/th_tcl.o endif $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o # This rule prevents make from using its default rules to try build # an executable named "manifest" out of the file named "manifest.c" # $(SRCDIR)/../manifest: # noop |
| > > > > > > > > > | | | | | | |
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 ... 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 ... 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 ... 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 |
# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl") ############################################################################## # # This file is automatically generated. Instead of editing this # file, edit "makemake.tcl" then run "tclsh makemake.tcl" # to regenerate this file. # # This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW/Mingw-w64. # #### # # Select one of mingw, mingw-64 (32-bit) or mingw-w64 (64-bit) # PREFIX=i686-pc-mingw32- #PREFIX=i686-w64-mingw32- #PREFIX=x86_64-w64-mingw32- #### The toplevel directory of the source tree. Fossil can be built # in a directory that is separate from the source tree. Just change # the following to point from the build directory to the src/ folder. # SRCDIR = src #### The directory into which object code files should be written. ................................................................................ #### C Compile and options for use in building executables that # will run on the target platform. This is usually the same # as BCC, unless you are cross-compiling. This C compiler builds # the finished binary for fossil. The BCC compiler above is used # for building intermediate code-generator tools. # TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR) # With HTTPS support ifdef FOSSIL_ENABLE_SSL TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR) endif # With Tcl support ................................................................................ MKINDEX = $(OBJDIR)/mkindex.exe VERSION = $(OBJDIR)/version.exe } writeln { all: $(OBJDIR) $(APPNAME) $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc cp $(SRCDIR)/../win/fossil.ico $(OBJDIR) $(PREFIX)windres -I$(SRCDIR) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o install: $(APPNAME) mkdir -p $(INSTALLDIR) mv $(APPNAME) $(INSTALLDIR) $(OBJDIR): mkdir $(OBJDIR) ................................................................................ $(OBJDIR)/th_lang.o \ $(OBJDIR)/cson_amalgamation.o ifdef FOSSIL_ENABLE_TCL EXTRAOBJ += $(OBJDIR)/th_tcl.o endif $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o # This rule prevents make from using its default rules to try build # an executable named "manifest" out of the file named "manifest.c" # $(SRCDIR)/../manifest: # noop |
Changes to win/Makefile.mingw.
4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 .. 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 ... 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 ... 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 |
# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl") ############################################################################## # # This file is automatically generated. Instead of editing this # file, edit "makemake.tcl" then run "tclsh makemake.tcl" # to regenerate this file. # # This is a makefile for us on windows using MinGW. # #### The toplevel directory of the source tree. Fossil can be built # in a directory that is separate from the source tree. Just change # the following to point from the build directory to the src/ folder. # SRCDIR = src #### The directory into which object code files should be written. ................................................................................ #### C Compile and options for use in building executables that # will run on the target platform. This is usually the same # as BCC, unless you are cross-compiling. This C compiler builds # the finished binary for fossil. The BCC compiler above is used # for building intermediate code-generator tools. # TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR) # With HTTPS support ifdef FOSSIL_ENABLE_SSL TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR) endif # With Tcl support ................................................................................ MAKEHEADERS = $(OBJDIR)/makeheaders.exe MKINDEX = $(OBJDIR)/mkindex.exe VERSION = $(OBJDIR)/version.exe all: $(OBJDIR) $(APPNAME) $(OBJDIR)/icon.o: $(SRCDIR)/../win/icon.rc cp $(SRCDIR)/../win/icon.rc $(OBJDIR) windres $(OBJDIR)/icon.rc -o $(OBJDIR)/icon.o install: $(APPNAME) mkdir -p $(INSTALLDIR) mv $(APPNAME) $(INSTALLDIR) $(OBJDIR): mkdir $(OBJDIR) ................................................................................ EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/cson_amalgamation.o ifdef FOSSIL_ENABLE_TCL EXTRAOBJ += $(OBJDIR)/th_tcl.o endif $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o # This rule prevents make from using its default rules to try build # an executable named "manifest" out of the file named "manifest.c" # $(SRCDIR)/../manifest: # noop |
| > > > > > > > > > | | | | > | | |
4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 ... 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 ... 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 ... 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 |
# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl") ############################################################################## # # This file is automatically generated. Instead of editing this # file, edit "makemake.tcl" then run "tclsh makemake.tcl" # to regenerate this file. # # This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW/Mingw-w64. # #### # # Select one of mingw, mingw-64 (32-bit) or mingw-w64 (64-bit) # PREFIX=i686-pc-mingw32- #PREFIX=i686-w64-mingw32- #PREFIX=x86_64-w64-mingw32- #### The toplevel directory of the source tree. Fossil can be built # in a directory that is separate from the source tree. Just change # the following to point from the build directory to the src/ folder. # SRCDIR = src #### The directory into which object code files should be written. ................................................................................ #### C Compile and options for use in building executables that # will run on the target platform. This is usually the same # as BCC, unless you are cross-compiling. This C compiler builds # the finished binary for fossil. The BCC compiler above is used # for building intermediate code-generator tools. # TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR) # With HTTPS support ifdef FOSSIL_ENABLE_SSL TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR) endif # With Tcl support ................................................................................ MAKEHEADERS = $(OBJDIR)/makeheaders.exe MKINDEX = $(OBJDIR)/mkindex.exe VERSION = $(OBJDIR)/version.exe all: $(OBJDIR) $(APPNAME) $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc cp $(SRCDIR)/../win/fossil.rc $(OBJDIR) cp $(SRCDIR)/../win/fossil.ico $(OBJDIR) $(PREFIX)windres -I$(SRCDIR) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o install: $(APPNAME) mkdir -p $(INSTALLDIR) mv $(APPNAME) $(INSTALLDIR) $(OBJDIR): mkdir $(OBJDIR) ................................................................................ EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/cson_amalgamation.o ifdef FOSSIL_ENABLE_TCL EXTRAOBJ += $(OBJDIR)/th_tcl.o endif $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o # This rule prevents make from using its default rules to try build # an executable named "manifest" out of the file named "manifest.c" # $(SRCDIR)/../manifest: # noop |
Changes to win/Makefile.mingw.mistachkin.
4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 .. 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 ... 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 ... 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 ... 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 |
# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl") ############################################################################## # # This file is automatically generated. Instead of editing this # file, edit "makemake.tcl" then run "tclsh makemake.tcl" # to regenerate this file. # # This is a makefile for us on windows using MinGW. # #### The toplevel directory of the source tree. Fossil can be built # in a directory that is separate from the source tree. Just change # the following to point from the build directory to the src/ folder. # SRCDIR = src #### The directory into which object code files should be written. ................................................................................ #### C Compile and options for use in building executables that # will run on the target platform. This is usually the same # as BCC, unless you are cross-compiling. This C compiler builds # the finished binary for fossil. The BCC compiler above is used # for building intermediate code-generator tools. # TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR) # With HTTPS support ifdef FOSSIL_ENABLE_SSL TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR) endif # With Tcl support ................................................................................ # other mandatory dependencies. We add the -static option here # so that we can build a static executable that will run in a # chroot jail. # LIB = -static LIB += -lmingwex -lz # OpenSSL: Add the necessary libaries required, if enabled. ifdef FOSSIL_ENABLE_SSL LIB += -lssl -lcrypto -lgdi32 endif # Tcl: Add the necessary libaries required, if enabled. ifdef FOSSIL_ENABLE_TCL LIB += $(LIBTCL) endif #### These libraries MUST appear in the same order as they do for Tcl # or linking with it will not work (exact reason unknown). # ................................................................................ MAKEHEADERS = $(OBJDIR)/makeheaders.exe MKINDEX = $(OBJDIR)/mkindex.exe VERSION = $(OBJDIR)/version.exe all: $(OBJDIR) $(APPNAME) $(OBJDIR)/icon.o: $(SRCDIR)/../win/icon.rc cp $(SRCDIR)/../win/icon.rc $(OBJDIR) windres $(OBJDIR)/icon.rc -o $(OBJDIR)/icon.o install: $(APPNAME) mkdir -p $(INSTALLDIR) mv $(APPNAME) $(INSTALLDIR) $(OBJDIR): mkdir $(OBJDIR) ................................................................................ EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/cson_amalgamation.o ifdef FOSSIL_ENABLE_TCL EXTRAOBJ += $(OBJDIR)/th_tcl.o endif $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o # This rule prevents make from using its default rules to try build # an executable named "manifest" out of the file named "manifest.c" # $(SRCDIR)/../manifest: # noop |
| > > > > > > > > > | | | | | | | | |
4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 ... 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 ... 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 ... 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 ... 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 |
# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl") ############################################################################## # # This file is automatically generated. Instead of editing this # file, edit "makemake.tcl" then run "tclsh makemake.tcl" # to regenerate this file. # # This is a makefile for use on Windows/Linux/Darwin/Cygwin using MinGW/Mingw-w64. # #### # # Select one of mingw, mingw-64 (32-bit) or mingw-w64 (64-bit) # PREFIX=i686-pc-mingw32- #PREFIX=i686-w64-mingw32- #PREFIX=x86_64-w64-mingw32- #### The toplevel directory of the source tree. Fossil can be built # in a directory that is separate from the source tree. Just change # the following to point from the build directory to the src/ folder. # SRCDIR = src #### The directory into which object code files should be written. ................................................................................ #### C Compile and options for use in building executables that # will run on the target platform. This is usually the same # as BCC, unless you are cross-compiling. This C compiler builds # the finished binary for fossil. The BCC compiler above is used # for building intermediate code-generator tools. # TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR) # With HTTPS support ifdef FOSSIL_ENABLE_SSL TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR) endif # With Tcl support ................................................................................ # other mandatory dependencies. We add the -static option here # so that we can build a static executable that will run in a # chroot jail. # LIB = -static LIB += -lmingwex -lz # OpenSSL: Add the necessary libraries required, if enabled. ifdef FOSSIL_ENABLE_SSL LIB += -lssl -lcrypto -lgdi32 endif # Tcl: Add the necessary libraries required, if enabled. ifdef FOSSIL_ENABLE_TCL LIB += $(LIBTCL) endif #### These libraries MUST appear in the same order as they do for Tcl # or linking with it will not work (exact reason unknown). # ................................................................................ MAKEHEADERS = $(OBJDIR)/makeheaders.exe MKINDEX = $(OBJDIR)/mkindex.exe VERSION = $(OBJDIR)/version.exe all: $(OBJDIR) $(APPNAME) $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc cp $(SRCDIR)/../win/fossil.ico $(OBJDIR) $(PREFIX)windres -I$(SRCDIR) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o install: $(APPNAME) mkdir -p $(INSTALLDIR) mv $(APPNAME) $(INSTALLDIR) $(OBJDIR): mkdir $(OBJDIR) ................................................................................ EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/cson_amalgamation.o ifdef FOSSIL_ENABLE_TCL EXTRAOBJ += $(OBJDIR)/th_tcl.o endif $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o # This rule prevents make from using its default rules to try build # an executable named "manifest" out of the file named "manifest.c" # $(SRCDIR)/../manifest: # noop |
Deleted win/Makefile.mingw32cross.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 |
#!/usr/bin/make # This makefile is for use with the Mingw32 *cross compiler* on Linux # #### The toplevel directory of the source tree. Fossil can be built # in a directory that is separate from the source tree. Just change # the following to point from the build directory to the src/ folder. # SRCDIR = ./src OBJDIR = ./wobj #### C Compiler and options for use in building executables that # will run on the platform that is doing the build. This is used # to compile code-generator programs as part of the build process. # See TCC below for the C compiler for building the finished binary. # BCC = gcc -s -O2 #### The suffix to add to executable files. ".exe" for windows. # Nothing for unix. # E = .exe #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) # FOSSIL_ENABLE_SSL=1 #### C Compile and options for use in building executables that # will run on the target platform. This is usually the same # as BCC, unless you are cross-compiling. This C compiler builds # the finished binary for fossil. The BCC compiler above is used # for building intermediate code-generator tools. # #TCC = gcc -O6 #TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage #TCC = gcc -g -Os -Wall #TCC = gcc -g -Os -Wall -DFOSSIL_I18N=0 -L/usr/local/lib -I/usr/local/include TCC=i686-pc-mingw32-gcc -O3 -s -Wall -DFOSSIL_I18N=0 # With HTTPS support ifdef FOSSIL_ENABLE_SSL TCC += -DFOSSIL_ENABLE_SSL=1 endif #### Extra arguments for linking the finished binary. Fossil needs # to link against the Z-Lib compression library. There are no # other dependencies. We sometimes add the -static option here # so that we can build a static executable that will run in a # chroot jail. # LIB=-lz -lssl -lcrypto -lwsock32 -lgdi32 CFLAGS=-O3 -s LDFLAGS=-s #### Tcl shell for use in running the fossil testsuite. # TCLSH = tclsh #### Include a configuration file that can override any one of these settings. # -include config.w32 # You should not need to change anything below this line ############################################################################### include $(SRCDIR)/main.mk |
< < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted win/icon.rc.
1 |
ID ICON "../win/fossil.ico"
|
< |