Fossil SCM

Make MinGW(-w64) compile work with USE_SYSTEM_SQLITE = 1. Only works if you have a static libsqlite3.a in your compiler environment.

jan.nijtmans 2014-04-29 21:29 trunk
Commit d00f2cfa8069bc2326ebf8cea95a03003d6e7550
Parent 6fdf91d7936c5ed…
3 files changed +17 -1 +17 -1 +29 -1
~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin
M src/makemake.tcl
+17 -1
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -420,10 +420,14 @@
420420
 # FOSSIL_ENABLE_TCL_STUBS = 1
421421
422422
 #### Load Tcl using the private stubs mechanism
423423
 #
424424
 # FOSSIL_ENABLE_TCL_PRIVATE_STUBS = 1
425
+
426
+#### Use 'system' sqlite
427
+#
428
+# USE_SYSTEM_SQLITE = 1
425429
426430
 #### Use the Tcl source directory instead of the install directory?
427431
 # This is useful when Tcl has been compiled statically with MinGW.
428432
 #
429433
 FOSSIL_TCL_SOURCE = 1
@@ -567,10 +571,14 @@
567571
568572
 # MinGW: If available, use the Unicode capable runtime startup code.
569573
 ifndef MINGW_IS_32BIT_ONLY
570574
 LIB += -municode
571575
 endif
576
+
577
+ifdef USE_SYSTEM_SQLITE
578
+LIB += -lsqlite3
579
+endif
572580
573581
 # OpenSSL: Add the necessary libraries required, if enabled.
574582
 ifdef FOSSIL_ENABLE_SSL
575583
 LIB += -lssl -lcrypto -lgdi32
576584
 endif
@@ -713,12 +721,20 @@
713721
 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
714722
715723
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
716724
 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
717725
726
+# The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
727
+# to 1. If it is set to 1, then there is no need to build or link
728
+# the sqlite3.o object. Instead, the system sqlite will be linked
729
+# using -lsqlite3.
730
+SQLITE3_OBJ.1 =
731
+SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
732
+SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
733
+
718734
 EXTRAOBJ = \
719
- $(OBJDIR)/sqlite3.o \
735
+ $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) \
720736
 $(OBJDIR)/shell.o \
721737
 $(OBJDIR)/th.o \
722738
 $(OBJDIR)/th_lang.o \
723739
 $(OBJDIR)/th_tcl.o \
724740
 $(OBJDIR)/cson_amalgamation.o
725741
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -420,10 +420,14 @@
420 # FOSSIL_ENABLE_TCL_STUBS = 1
421
422 #### Load Tcl using the private stubs mechanism
423 #
424 # FOSSIL_ENABLE_TCL_PRIVATE_STUBS = 1
 
 
 
 
425
426 #### Use the Tcl source directory instead of the install directory?
427 # This is useful when Tcl has been compiled statically with MinGW.
428 #
429 FOSSIL_TCL_SOURCE = 1
@@ -567,10 +571,14 @@
567
568 # MinGW: If available, use the Unicode capable runtime startup code.
569 ifndef MINGW_IS_32BIT_ONLY
570 LIB += -municode
571 endif
 
 
 
 
572
573 # OpenSSL: Add the necessary libraries required, if enabled.
574 ifdef FOSSIL_ENABLE_SSL
575 LIB += -lssl -lcrypto -lgdi32
576 endif
@@ -713,12 +721,20 @@
713 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
714
715 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
716 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
717
 
 
 
 
 
 
 
 
718 EXTRAOBJ = \
719 $(OBJDIR)/sqlite3.o \
720 $(OBJDIR)/shell.o \
721 $(OBJDIR)/th.o \
722 $(OBJDIR)/th_lang.o \
723 $(OBJDIR)/th_tcl.o \
724 $(OBJDIR)/cson_amalgamation.o
725
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -420,10 +420,14 @@
420 # FOSSIL_ENABLE_TCL_STUBS = 1
421
422 #### Load Tcl using the private stubs mechanism
423 #
424 # FOSSIL_ENABLE_TCL_PRIVATE_STUBS = 1
425
426 #### Use 'system' sqlite
427 #
428 # USE_SYSTEM_SQLITE = 1
429
430 #### Use the Tcl source directory instead of the install directory?
431 # This is useful when Tcl has been compiled statically with MinGW.
432 #
433 FOSSIL_TCL_SOURCE = 1
@@ -567,10 +571,14 @@
571
572 # MinGW: If available, use the Unicode capable runtime startup code.
573 ifndef MINGW_IS_32BIT_ONLY
574 LIB += -municode
575 endif
576
577 ifdef USE_SYSTEM_SQLITE
578 LIB += -lsqlite3
579 endif
580
581 # OpenSSL: Add the necessary libraries required, if enabled.
582 ifdef FOSSIL_ENABLE_SSL
583 LIB += -lssl -lcrypto -lgdi32
584 endif
@@ -713,12 +721,20 @@
721 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
722
723 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
724 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
725
726 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
727 # to 1. If it is set to 1, then there is no need to build or link
728 # the sqlite3.o object. Instead, the system sqlite will be linked
729 # using -lsqlite3.
730 SQLITE3_OBJ.1 =
731 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
732 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
733
734 EXTRAOBJ = \
735 $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) \
736 $(OBJDIR)/shell.o \
737 $(OBJDIR)/th.o \
738 $(OBJDIR)/th_lang.o \
739 $(OBJDIR)/th_tcl.o \
740 $(OBJDIR)/cson_amalgamation.o
741
M win/Makefile.mingw
+17 -1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -59,10 +59,14 @@
5959
 # FOSSIL_ENABLE_TCL_STUBS = 1
6060
6161
 #### Load Tcl using the private stubs mechanism
6262
 #
6363
 # FOSSIL_ENABLE_TCL_PRIVATE_STUBS = 1
64
+
65
+#### Use 'system' sqlite
66
+#
67
+# USE_SYSTEM_SQLITE = 1
6468
6569
 #### Use the Tcl source directory instead of the install directory?
6670
 # This is useful when Tcl has been compiled statically with MinGW.
6771
 #
6872
 FOSSIL_TCL_SOURCE = 1
@@ -206,10 +210,14 @@
206210
207211
 # MinGW: If available, use the Unicode capable runtime startup code.
208212
 ifndef MINGW_IS_32BIT_ONLY
209213
 LIB += -municode
210214
 endif
215
+
216
+ifdef USE_SYSTEM_SQLITE
217
+LIB += -lsqlite3
218
+endif
211219
212220
 # OpenSSL: Add the necessary libraries required, if enabled.
213221
 ifdef FOSSIL_ENABLE_SSL
214222
 LIB += -lssl -lcrypto -lgdi32
215223
 endif
@@ -672,11 +680,19 @@
672680
 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
673681
674682
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
675683
 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
676684
677
-EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/th_tcl.o $(OBJDIR)/cson_amalgamation.o
685
+# The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
686
+# to 1. If it is set to 1, then there is no need to build or link
687
+# the sqlite3.o object. Instead, the system sqlite will be linked
688
+# using -lsqlite3.
689
+SQLITE3_OBJ.1 =
690
+SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
691
+SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
692
+
693
+EXTRAOBJ = $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/th_tcl.o $(OBJDIR)/cson_amalgamation.o
678694
679695
 zlib:
680696
 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
681697
682698
 clean-zlib:
683699
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -59,10 +59,14 @@
59 # FOSSIL_ENABLE_TCL_STUBS = 1
60
61 #### Load Tcl using the private stubs mechanism
62 #
63 # FOSSIL_ENABLE_TCL_PRIVATE_STUBS = 1
 
 
 
 
64
65 #### Use the Tcl source directory instead of the install directory?
66 # This is useful when Tcl has been compiled statically with MinGW.
67 #
68 FOSSIL_TCL_SOURCE = 1
@@ -206,10 +210,14 @@
206
207 # MinGW: If available, use the Unicode capable runtime startup code.
208 ifndef MINGW_IS_32BIT_ONLY
209 LIB += -municode
210 endif
 
 
 
 
211
212 # OpenSSL: Add the necessary libraries required, if enabled.
213 ifdef FOSSIL_ENABLE_SSL
214 LIB += -lssl -lcrypto -lgdi32
215 endif
@@ -672,11 +680,19 @@
672 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
673
674 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
675 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
676
677 EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/th_tcl.o $(OBJDIR)/cson_amalgamation.o
 
 
 
 
 
 
 
 
678
679 zlib:
680 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
681
682 clean-zlib:
683
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -59,10 +59,14 @@
59 # FOSSIL_ENABLE_TCL_STUBS = 1
60
61 #### Load Tcl using the private stubs mechanism
62 #
63 # FOSSIL_ENABLE_TCL_PRIVATE_STUBS = 1
64
65 #### Use 'system' sqlite
66 #
67 # USE_SYSTEM_SQLITE = 1
68
69 #### Use the Tcl source directory instead of the install directory?
70 # This is useful when Tcl has been compiled statically with MinGW.
71 #
72 FOSSIL_TCL_SOURCE = 1
@@ -206,10 +210,14 @@
210
211 # MinGW: If available, use the Unicode capable runtime startup code.
212 ifndef MINGW_IS_32BIT_ONLY
213 LIB += -municode
214 endif
215
216 ifdef USE_SYSTEM_SQLITE
217 LIB += -lsqlite3
218 endif
219
220 # OpenSSL: Add the necessary libraries required, if enabled.
221 ifdef FOSSIL_ENABLE_SSL
222 LIB += -lssl -lcrypto -lgdi32
223 endif
@@ -672,11 +680,19 @@
680 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
681
682 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
683 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
684
685 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
686 # to 1. If it is set to 1, then there is no need to build or link
687 # the sqlite3.o object. Instead, the system sqlite will be linked
688 # using -lsqlite3.
689 SQLITE3_OBJ.1 =
690 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
691 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
692
693 EXTRAOBJ = $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/th_tcl.o $(OBJDIR)/cson_amalgamation.o
694
695 zlib:
696 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
697
698 clean-zlib:
699
M win/Makefile.mingw.mistachkin
+29 -1
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -59,10 +59,14 @@
5959
 FOSSIL_ENABLE_TCL_STUBS = 1
6060
6161
 #### Load Tcl using the private stubs mechanism
6262
 #
6363
 FOSSIL_ENABLE_TCL_PRIVATE_STUBS = 1
64
+
65
+#### Use 'system' sqlite
66
+#
67
+# USE_SYSTEM_SQLITE = 1
6468
6569
 #### Use the Tcl source directory instead of the install directory?
6670
 # This is useful when Tcl has been compiled statically with MinGW.
6771
 #
6872
 FOSSIL_TCL_SOURCE = 1
@@ -206,10 +210,14 @@
206210
207211
 # MinGW: If available, use the Unicode capable runtime startup code.
208212
 ifndef MINGW_IS_32BIT_ONLY
209213
 LIB += -municode
210214
 endif
215
+
216
+ifdef USE_SYSTEM_SQLITE
217
+LIB += -lsqlite3
218
+endif
211219
212220
 # OpenSSL: Add the necessary libraries required, if enabled.
213221
 ifdef FOSSIL_ENABLE_SSL
214222
 LIB += -lssl -lcrypto -lgdi32
215223
 endif
@@ -263,10 +271,11 @@
263271
 $(SRCDIR)/bag.c \
264272
 $(SRCDIR)/bisect.c \
265273
 $(SRCDIR)/blob.c \
266274
 $(SRCDIR)/branch.c \
267275
 $(SRCDIR)/browse.c \
276
+ $(SRCDIR)/cache.c \
268277
 $(SRCDIR)/captcha.c \
269278
 $(SRCDIR)/cgi.c \
270279
 $(SRCDIR)/checkin.c \
271280
 $(SRCDIR)/checkout.c \
272281
 $(SRCDIR)/clearsign.c \
@@ -374,10 +383,11 @@
374383
 $(OBJDIR)/bag_.c \
375384
 $(OBJDIR)/bisect_.c \
376385
 $(OBJDIR)/blob_.c \
377386
 $(OBJDIR)/branch_.c \
378387
 $(OBJDIR)/browse_.c \
388
+ $(OBJDIR)/cache_.c \
379389
 $(OBJDIR)/captcha_.c \
380390
 $(OBJDIR)/cgi_.c \
381391
 $(OBJDIR)/checkin_.c \
382392
 $(OBJDIR)/checkout_.c \
383393
 $(OBJDIR)/clearsign_.c \
@@ -485,10 +495,11 @@
485495
 $(OBJDIR)/bag.o \
486496
 $(OBJDIR)/bisect.o \
487497
 $(OBJDIR)/blob.o \
488498
 $(OBJDIR)/branch.o \
489499
 $(OBJDIR)/browse.o \
500
+ $(OBJDIR)/cache.o \
490501
 $(OBJDIR)/captcha.o \
491502
 $(OBJDIR)/cgi.o \
492503
 $(OBJDIR)/checkin.o \
493504
 $(OBJDIR)/checkout.o \
494505
 $(OBJDIR)/clearsign.o \
@@ -669,11 +680,19 @@
669680
 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
670681
671682
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
672683
 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
673684
674
-EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/th_tcl.o $(OBJDIR)/cson_amalgamation.o
685
+# The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
686
+# to 1. If it is set to 1, then there is no need to build or link
687
+# the sqlite3.o object. Instead, the system sqlite will be linked
688
+# using -lsqlite3.
689
+SQLITE3_OBJ.1 =
690
+SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
691
+SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
692
+
693
+EXTRAOBJ = $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/th_tcl.o $(OBJDIR)/cson_amalgamation.o
675694
676695
 zlib:
677696
 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
678697
679698
 clean-zlib:
@@ -724,10 +743,11 @@
724743
 $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
725744
 $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
726745
 $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h \
727746
 $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h \
728747
 $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h \
748
+ $(OBJDIR)/cache_.c:$(OBJDIR)/cache.h \
729749
 $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h \
730750
 $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h \
731751
 $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h \
732752
 $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h \
733753
 $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h \
@@ -897,10 +917,18 @@
897917
898918
 $(OBJDIR)/browse.o: $(OBJDIR)/browse_.c $(OBJDIR)/browse.h $(SRCDIR)/config.h
899919
 $(XTCC) -o $(OBJDIR)/browse.o -c $(OBJDIR)/browse_.c
900920
901921
 $(OBJDIR)/browse.h: $(OBJDIR)/headers
922
+
923
+$(OBJDIR)/cache_.c: $(SRCDIR)/cache.c $(OBJDIR)/translate
924
+ $(TRANSLATE) $(SRCDIR)/cache.c >$(OBJDIR)/cache_.c
925
+
926
+$(OBJDIR)/cache.o: $(OBJDIR)/cache_.c $(OBJDIR)/cache.h $(SRCDIR)/config.h
927
+ $(XTCC) -o $(OBJDIR)/cache.o -c $(OBJDIR)/cache_.c
928
+
929
+$(OBJDIR)/cache.h: $(OBJDIR)/headers
902930
903931
 $(OBJDIR)/captcha_.c: $(SRCDIR)/captcha.c $(OBJDIR)/translate
904932
 $(TRANSLATE) $(SRCDIR)/captcha.c >$(OBJDIR)/captcha_.c
905933
906934
 $(OBJDIR)/captcha.o: $(OBJDIR)/captcha_.c $(OBJDIR)/captcha.h $(SRCDIR)/config.h
907935
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -59,10 +59,14 @@
59 FOSSIL_ENABLE_TCL_STUBS = 1
60
61 #### Load Tcl using the private stubs mechanism
62 #
63 FOSSIL_ENABLE_TCL_PRIVATE_STUBS = 1
 
 
 
 
64
65 #### Use the Tcl source directory instead of the install directory?
66 # This is useful when Tcl has been compiled statically with MinGW.
67 #
68 FOSSIL_TCL_SOURCE = 1
@@ -206,10 +210,14 @@
206
207 # MinGW: If available, use the Unicode capable runtime startup code.
208 ifndef MINGW_IS_32BIT_ONLY
209 LIB += -municode
210 endif
 
 
 
 
211
212 # OpenSSL: Add the necessary libraries required, if enabled.
213 ifdef FOSSIL_ENABLE_SSL
214 LIB += -lssl -lcrypto -lgdi32
215 endif
@@ -263,10 +271,11 @@
263 $(SRCDIR)/bag.c \
264 $(SRCDIR)/bisect.c \
265 $(SRCDIR)/blob.c \
266 $(SRCDIR)/branch.c \
267 $(SRCDIR)/browse.c \
 
268 $(SRCDIR)/captcha.c \
269 $(SRCDIR)/cgi.c \
270 $(SRCDIR)/checkin.c \
271 $(SRCDIR)/checkout.c \
272 $(SRCDIR)/clearsign.c \
@@ -374,10 +383,11 @@
374 $(OBJDIR)/bag_.c \
375 $(OBJDIR)/bisect_.c \
376 $(OBJDIR)/blob_.c \
377 $(OBJDIR)/branch_.c \
378 $(OBJDIR)/browse_.c \
 
379 $(OBJDIR)/captcha_.c \
380 $(OBJDIR)/cgi_.c \
381 $(OBJDIR)/checkin_.c \
382 $(OBJDIR)/checkout_.c \
383 $(OBJDIR)/clearsign_.c \
@@ -485,10 +495,11 @@
485 $(OBJDIR)/bag.o \
486 $(OBJDIR)/bisect.o \
487 $(OBJDIR)/blob.o \
488 $(OBJDIR)/branch.o \
489 $(OBJDIR)/browse.o \
 
490 $(OBJDIR)/captcha.o \
491 $(OBJDIR)/cgi.o \
492 $(OBJDIR)/checkin.o \
493 $(OBJDIR)/checkout.o \
494 $(OBJDIR)/clearsign.o \
@@ -669,11 +680,19 @@
669 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
670
671 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
672 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
673
674 EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/th_tcl.o $(OBJDIR)/cson_amalgamation.o
 
 
 
 
 
 
 
 
675
676 zlib:
677 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
678
679 clean-zlib:
@@ -724,10 +743,11 @@
724 $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
725 $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
726 $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h \
727 $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h \
728 $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h \
 
729 $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h \
730 $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h \
731 $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h \
732 $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h \
733 $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h \
@@ -897,10 +917,18 @@
897
898 $(OBJDIR)/browse.o: $(OBJDIR)/browse_.c $(OBJDIR)/browse.h $(SRCDIR)/config.h
899 $(XTCC) -o $(OBJDIR)/browse.o -c $(OBJDIR)/browse_.c
900
901 $(OBJDIR)/browse.h: $(OBJDIR)/headers
 
 
 
 
 
 
 
 
902
903 $(OBJDIR)/captcha_.c: $(SRCDIR)/captcha.c $(OBJDIR)/translate
904 $(TRANSLATE) $(SRCDIR)/captcha.c >$(OBJDIR)/captcha_.c
905
906 $(OBJDIR)/captcha.o: $(OBJDIR)/captcha_.c $(OBJDIR)/captcha.h $(SRCDIR)/config.h
907
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -59,10 +59,14 @@
59 FOSSIL_ENABLE_TCL_STUBS = 1
60
61 #### Load Tcl using the private stubs mechanism
62 #
63 FOSSIL_ENABLE_TCL_PRIVATE_STUBS = 1
64
65 #### Use 'system' sqlite
66 #
67 # USE_SYSTEM_SQLITE = 1
68
69 #### Use the Tcl source directory instead of the install directory?
70 # This is useful when Tcl has been compiled statically with MinGW.
71 #
72 FOSSIL_TCL_SOURCE = 1
@@ -206,10 +210,14 @@
210
211 # MinGW: If available, use the Unicode capable runtime startup code.
212 ifndef MINGW_IS_32BIT_ONLY
213 LIB += -municode
214 endif
215
216 ifdef USE_SYSTEM_SQLITE
217 LIB += -lsqlite3
218 endif
219
220 # OpenSSL: Add the necessary libraries required, if enabled.
221 ifdef FOSSIL_ENABLE_SSL
222 LIB += -lssl -lcrypto -lgdi32
223 endif
@@ -263,10 +271,11 @@
271 $(SRCDIR)/bag.c \
272 $(SRCDIR)/bisect.c \
273 $(SRCDIR)/blob.c \
274 $(SRCDIR)/branch.c \
275 $(SRCDIR)/browse.c \
276 $(SRCDIR)/cache.c \
277 $(SRCDIR)/captcha.c \
278 $(SRCDIR)/cgi.c \
279 $(SRCDIR)/checkin.c \
280 $(SRCDIR)/checkout.c \
281 $(SRCDIR)/clearsign.c \
@@ -374,10 +383,11 @@
383 $(OBJDIR)/bag_.c \
384 $(OBJDIR)/bisect_.c \
385 $(OBJDIR)/blob_.c \
386 $(OBJDIR)/branch_.c \
387 $(OBJDIR)/browse_.c \
388 $(OBJDIR)/cache_.c \
389 $(OBJDIR)/captcha_.c \
390 $(OBJDIR)/cgi_.c \
391 $(OBJDIR)/checkin_.c \
392 $(OBJDIR)/checkout_.c \
393 $(OBJDIR)/clearsign_.c \
@@ -485,10 +495,11 @@
495 $(OBJDIR)/bag.o \
496 $(OBJDIR)/bisect.o \
497 $(OBJDIR)/blob.o \
498 $(OBJDIR)/branch.o \
499 $(OBJDIR)/browse.o \
500 $(OBJDIR)/cache.o \
501 $(OBJDIR)/captcha.o \
502 $(OBJDIR)/cgi.o \
503 $(OBJDIR)/checkin.o \
504 $(OBJDIR)/checkout.o \
505 $(OBJDIR)/clearsign.o \
@@ -669,11 +680,19 @@
680 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
681
682 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
683 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
684
685 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
686 # to 1. If it is set to 1, then there is no need to build or link
687 # the sqlite3.o object. Instead, the system sqlite will be linked
688 # using -lsqlite3.
689 SQLITE3_OBJ.1 =
690 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
691 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
692
693 EXTRAOBJ = $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/th_tcl.o $(OBJDIR)/cson_amalgamation.o
694
695 zlib:
696 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
697
698 clean-zlib:
@@ -724,10 +743,11 @@
743 $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
744 $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
745 $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h \
746 $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h \
747 $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h \
748 $(OBJDIR)/cache_.c:$(OBJDIR)/cache.h \
749 $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h \
750 $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h \
751 $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h \
752 $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h \
753 $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h \
@@ -897,10 +917,18 @@
917
918 $(OBJDIR)/browse.o: $(OBJDIR)/browse_.c $(OBJDIR)/browse.h $(SRCDIR)/config.h
919 $(XTCC) -o $(OBJDIR)/browse.o -c $(OBJDIR)/browse_.c
920
921 $(OBJDIR)/browse.h: $(OBJDIR)/headers
922
923 $(OBJDIR)/cache_.c: $(SRCDIR)/cache.c $(OBJDIR)/translate
924 $(TRANSLATE) $(SRCDIR)/cache.c >$(OBJDIR)/cache_.c
925
926 $(OBJDIR)/cache.o: $(OBJDIR)/cache_.c $(OBJDIR)/cache.h $(SRCDIR)/config.h
927 $(XTCC) -o $(OBJDIR)/cache.o -c $(OBJDIR)/cache_.c
928
929 $(OBJDIR)/cache.h: $(OBJDIR)/headers
930
931 $(OBJDIR)/captcha_.c: $(SRCDIR)/captcha.c $(OBJDIR)/translate
932 $(TRANSLATE) $(SRCDIR)/captcha.c >$(OBJDIR)/captcha_.c
933
934 $(OBJDIR)/captcha.o: $(OBJDIR)/captcha_.c $(OBJDIR)/captcha.h $(SRCDIR)/config.h
935

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button