| | @@ -8,13 +8,10 @@ |
| 8 | 8 | OBJDIR = . |
| 9 | 9 | OX = . |
| 10 | 10 | O = .obj |
| 11 | 11 | E = .exe |
| 12 | 12 | |
| 13 | | -# Maybe MSCDIR, SSL, ZLIB, or INCL needs adjustment |
| 14 | | -MSCDIR = c:\msc |
| 15 | | - |
| 16 | 13 | # Uncomment below for SSL support |
| 17 | 14 | SSL = |
| 18 | 15 | SSLLIB = |
| 19 | 16 | #SSL = -DFOSSIL_ENABLE_SSL=1 |
| 20 | 17 | #SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib advapi32.lib |
| | @@ -22,27 +19,27 @@ |
| 22 | 19 | # zlib options |
| 23 | 20 | # When using precompiled from http://zlib.net/zlib125-dll.zip |
| 24 | 21 | #ZINCDIR = C:\zlib125-dll\include |
| 25 | 22 | #ZLIBDIR = C:\zlib125-dll\lib |
| 26 | 23 | #ZLIB = zdll.lib |
| 27 | | -ZINCDIR = $(MSCDIR)\extra\include |
| 28 | | -ZLIBDIR = $(MSCDIR)\extra\lib |
| 24 | +ZINCDIR = $(SRCDIR)\..\zlib-1.2.5 |
| 25 | +ZLIBDIR = $(SRCDIR)\..\zlib-1.2.5 |
| 29 | 26 | ZLIB = zlib.lib |
| 30 | 27 | |
| 31 | | -INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR) |
| 28 | +INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(ZINCDIR) |
| 32 | 29 | |
| 33 | | -CFLAGS = -nologo -MT -O2 |
| 30 | +CFLAGS = -nologo -MT -O2 -DTIMEVAL_H -DDIRENT_H |
| 34 | 31 | BCC = $(CC) $(CFLAGS) |
| 35 | 32 | TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL) |
| 36 | 33 | LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB) |
| 37 | | -LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR) |
| 34 | +LIBDIR = -LIBPATH:$(ZLIBDIR) |
| 38 | 35 | |
| 39 | 36 | SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 /DSQLITE_THREADSAFE=0 /DSQLITE_DEFAULT_FILE_FORMAT=4 /DSQLITE_ENABLE_STAT3 /Dlocaltime=fossil_localtime /DSQLITE_ENABLE_LOCKING_STYLE=0 |
| 40 | 37 | |
| 41 | 38 | SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_diff_.c json_login_.c json_query_.c json_report_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c |
| 42 | 39 | |
| 43 | | -OBJ = $(OX)\add$O $(OX)\allrepo$O $(OX)\attach$O $(OX)\bag$O $(OX)\bisect$O $(OX)\blob$O $(OX)\branch$O $(OX)\browse$O $(OX)\captcha$O $(OX)\cgi$O $(OX)\checkin$O $(OX)\checkout$O $(OX)\clearsign$O $(OX)\clone$O $(OX)\comformat$O $(OX)\configure$O $(OX)\content$O $(OX)\db$O $(OX)\delta$O $(OX)\deltacmd$O $(OX)\descendants$O $(OX)\diff$O $(OX)\diffcmd$O $(OX)\doc$O $(OX)\encode$O $(OX)\event$O $(OX)\export$O $(OX)\file$O $(OX)\finfo$O $(OX)\glob$O $(OX)\graph$O $(OX)\gzip$O $(OX)\http$O $(OX)\http_socket$O $(OX)\http_ssl$O $(OX)\http_transport$O $(OX)\import$O $(OX)\info$O $(OX)\json$O $(OX)\json_artifact$O $(OX)\json_branch$O $(OX)\json_diff$O $(OX)\json_login$O $(OX)\json_query$O $(OX)\json_report$O $(OX)\json_tag$O $(OX)\json_timeline$O $(OX)\json_user$O $(OX)\json_wiki$O $(OX)\leaf$O $(OX)\login$O $(OX)\main$O $(OX)\manifest$O $(OX)\md5$O $(OX)\merge$O $(OX)\merge3$O $(OX)\name$O $(OX)\path$O $(OX)\pivot$O $(OX)\popen$O $(OX)\pqueue$O $(OX)\printf$O $(OX)\rebuild$O $(OX)\report$O $(OX)\rss$O $(OX)\schema$O $(OX)\search$O $(OX)\setup$O $(OX)\sha1$O $(OX)\shun$O $(OX)\skins$O $(OX)\sqlcmd$O $(OX)\stash$O $(OX)\stat$O $(OX)\style$O $(OX)\sync$O $(OX)\tag$O $(OX)\tar$O $(OX)\th_main$O $(OX)\timeline$O $(OX)\tkt$O $(OX)\tktsetup$O $(OX)\undo$O $(OX)\update$O $(OX)\url$O $(OX)\user$O $(OX)\verify$O $(OX)\vfile$O $(OX)\wiki$O $(OX)\wikiformat$O $(OX)\winhttp$O $(OX)\xfer$O $(OX)\zip$O $(OX)\shell$O $(OX)\sqlite3$O $(OX)\th$O $(OX)\th_lang$O |
| 40 | +OBJ = $(OX)\add$O $(OX)\allrepo$O $(OX)\attach$O $(OX)\bag$O $(OX)\bisect$O $(OX)\blob$O $(OX)\branch$O $(OX)\browse$O $(OX)\captcha$O $(OX)\cgi$O $(OX)\checkin$O $(OX)\checkout$O $(OX)\clearsign$O $(OX)\clone$O $(OX)\comformat$O $(OX)\configure$O $(OX)\content$O $(OX)\db$O $(OX)\delta$O $(OX)\deltacmd$O $(OX)\descendants$O $(OX)\diff$O $(OX)\diffcmd$O $(OX)\doc$O $(OX)\encode$O $(OX)\event$O $(OX)\export$O $(OX)\file$O $(OX)\finfo$O $(OX)\glob$O $(OX)\graph$O $(OX)\gzip$O $(OX)\http$O $(OX)\http_socket$O $(OX)\http_ssl$O $(OX)\http_transport$O $(OX)\import$O $(OX)\info$O $(OX)\jimtcl$O $(OX)\json$O $(OX)\json_artifact$O $(OX)\json_branch$O $(OX)\json_diff$O $(OX)\json_login$O $(OX)\json_query$O $(OX)\json_report$O $(OX)\json_tag$O $(OX)\json_timeline$O $(OX)\json_user$O $(OX)\json_wiki$O $(OX)\leaf$O $(OX)\login$O $(OX)\main$O $(OX)\manifest$O $(OX)\md5$O $(OX)\merge$O $(OX)\merge3$O $(OX)\name$O $(OX)\path$O $(OX)\pivot$O $(OX)\popen$O $(OX)\pqueue$O $(OX)\printf$O $(OX)\rebuild$O $(OX)\report$O $(OX)\rss$O $(OX)\schema$O $(OX)\search$O $(OX)\setup$O $(OX)\sha1$O $(OX)\shun$O $(OX)\skins$O $(OX)\sqlcmd$O $(OX)\stash$O $(OX)\stat$O $(OX)\style$O $(OX)\sync$O $(OX)\tag$O $(OX)\tar$O $(OX)\th_main$O $(OX)\timeline$O $(OX)\tkt$O $(OX)\tktsetup$O $(OX)\undo$O $(OX)\update$O $(OX)\url$O $(OX)\user$O $(OX)\verify$O $(OX)\vfile$O $(OX)\wiki$O $(OX)\wikiformat$O $(OX)\winhttp$O $(OX)\xfer$O $(OX)\zip$O $(OX)\shell$O $(OX)\sqlite3$O |
| 44 | 41 | |
| 45 | 42 | |
| 46 | 43 | APPNAME = $(OX)\fossil$(E) |
| 47 | 44 | |
| 48 | 45 | all: $(OX) $(APPNAME) |
| | @@ -50,107 +47,106 @@ |
| 50 | 47 | $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts |
| 51 | 48 | cd $(OX) |
| 52 | 49 | link /NODEFAULTLIB:msvcrt -OUT:$@ $(LIBDIR) @linkopts |
| 53 | 50 | |
| 54 | 51 | $(OX)\linkopts: $B\win\Makefile.msc |
| 55 | | - echo $(OX)\add.obj > $@ |
| 56 | | - echo $(OX)\allrepo.obj >> $@ |
| 57 | | - echo $(OX)\attach.obj >> $@ |
| 58 | | - echo $(OX)\bag.obj >> $@ |
| 59 | | - echo $(OX)\bisect.obj >> $@ |
| 60 | | - echo $(OX)\blob.obj >> $@ |
| 61 | | - echo $(OX)\branch.obj >> $@ |
| 62 | | - echo $(OX)\browse.obj >> $@ |
| 63 | | - echo $(OX)\captcha.obj >> $@ |
| 64 | | - echo $(OX)\cgi.obj >> $@ |
| 65 | | - echo $(OX)\checkin.obj >> $@ |
| 66 | | - echo $(OX)\checkout.obj >> $@ |
| 67 | | - echo $(OX)\clearsign.obj >> $@ |
| 68 | | - echo $(OX)\clone.obj >> $@ |
| 69 | | - echo $(OX)\comformat.obj >> $@ |
| 70 | | - echo $(OX)\configure.obj >> $@ |
| 71 | | - echo $(OX)\content.obj >> $@ |
| 72 | | - echo $(OX)\db.obj >> $@ |
| 73 | | - echo $(OX)\delta.obj >> $@ |
| 74 | | - echo $(OX)\deltacmd.obj >> $@ |
| 75 | | - echo $(OX)\descendants.obj >> $@ |
| 76 | | - echo $(OX)\diff.obj >> $@ |
| 77 | | - echo $(OX)\diffcmd.obj >> $@ |
| 78 | | - echo $(OX)\doc.obj >> $@ |
| 79 | | - echo $(OX)\encode.obj >> $@ |
| 80 | | - echo $(OX)\event.obj >> $@ |
| 81 | | - echo $(OX)\export.obj >> $@ |
| 82 | | - echo $(OX)\file.obj >> $@ |
| 83 | | - echo $(OX)\finfo.obj >> $@ |
| 84 | | - echo $(OX)\glob.obj >> $@ |
| 85 | | - echo $(OX)\graph.obj >> $@ |
| 86 | | - echo $(OX)\gzip.obj >> $@ |
| 87 | | - echo $(OX)\http.obj >> $@ |
| 88 | | - echo $(OX)\http_socket.obj >> $@ |
| 89 | | - echo $(OX)\http_ssl.obj >> $@ |
| 90 | | - echo $(OX)\http_transport.obj >> $@ |
| 91 | | - echo $(OX)\import.obj >> $@ |
| 92 | | - echo $(OX)\info.obj >> $@ |
| 93 | | - echo $(OX)\json.obj >> $@ |
| 94 | | - echo $(OX)\json_artifact.obj >> $@ |
| 95 | | - echo $(OX)\json_branch.obj >> $@ |
| 96 | | - echo $(OX)\json_diff.obj >> $@ |
| 97 | | - echo $(OX)\json_login.obj >> $@ |
| 98 | | - echo $(OX)\json_query.obj >> $@ |
| 99 | | - echo $(OX)\json_report.obj >> $@ |
| 100 | | - echo $(OX)\json_tag.obj >> $@ |
| 101 | | - echo $(OX)\json_timeline.obj >> $@ |
| 102 | | - echo $(OX)\json_user.obj >> $@ |
| 103 | | - echo $(OX)\json_wiki.obj >> $@ |
| 104 | | - echo $(OX)\leaf.obj >> $@ |
| 105 | | - echo $(OX)\login.obj >> $@ |
| 106 | | - echo $(OX)\main.obj >> $@ |
| 107 | | - echo $(OX)\manifest.obj >> $@ |
| 108 | | - echo $(OX)\md5.obj >> $@ |
| 109 | | - echo $(OX)\merge.obj >> $@ |
| 110 | | - echo $(OX)\merge3.obj >> $@ |
| 111 | | - echo $(OX)\name.obj >> $@ |
| 112 | | - echo $(OX)\path.obj >> $@ |
| 113 | | - echo $(OX)\pivot.obj >> $@ |
| 114 | | - echo $(OX)\popen.obj >> $@ |
| 115 | | - echo $(OX)\pqueue.obj >> $@ |
| 116 | | - echo $(OX)\printf.obj >> $@ |
| 117 | | - echo $(OX)\rebuild.obj >> $@ |
| 118 | | - echo $(OX)\report.obj >> $@ |
| 119 | | - echo $(OX)\rss.obj >> $@ |
| 120 | | - echo $(OX)\schema.obj >> $@ |
| 121 | | - echo $(OX)\search.obj >> $@ |
| 122 | | - echo $(OX)\setup.obj >> $@ |
| 123 | | - echo $(OX)\sha1.obj >> $@ |
| 124 | | - echo $(OX)\shell.obj >> $@ |
| 125 | | - echo $(OX)\shun.obj >> $@ |
| 126 | | - echo $(OX)\skins.obj >> $@ |
| 127 | | - echo $(OX)\sqlcmd.obj >> $@ |
| 128 | | - echo $(OX)\sqlite3.obj >> $@ |
| 129 | | - echo $(OX)\stash.obj >> $@ |
| 130 | | - echo $(OX)\stat.obj >> $@ |
| 131 | | - echo $(OX)\style.obj >> $@ |
| 132 | | - echo $(OX)\sync.obj >> $@ |
| 133 | | - echo $(OX)\tag.obj >> $@ |
| 134 | | - echo $(OX)\tar.obj >> $@ |
| 135 | | - echo $(OX)\th.obj >> $@ |
| 136 | | - echo $(OX)\th_lang.obj >> $@ |
| 137 | | - echo $(OX)\th_main.obj >> $@ |
| 138 | | - echo $(OX)\timeline.obj >> $@ |
| 139 | | - echo $(OX)\tkt.obj >> $@ |
| 140 | | - echo $(OX)\tktsetup.obj >> $@ |
| 141 | | - echo $(OX)\undo.obj >> $@ |
| 142 | | - echo $(OX)\update.obj >> $@ |
| 143 | | - echo $(OX)\url.obj >> $@ |
| 144 | | - echo $(OX)\user.obj >> $@ |
| 145 | | - echo $(OX)\verify.obj >> $@ |
| 146 | | - echo $(OX)\vfile.obj >> $@ |
| 147 | | - echo $(OX)\wiki.obj >> $@ |
| 148 | | - echo $(OX)\wikiformat.obj >> $@ |
| 149 | | - echo $(OX)\winhttp.obj >> $@ |
| 150 | | - echo $(OX)\xfer.obj >> $@ |
| 151 | | - echo $(OX)\zip.obj >> $@ |
| 52 | + echo $(OX)\add$O >$@ |
| 53 | + echo $(OX)\allrepo$O >> $@ |
| 54 | + echo $(OX)\attach$O >> $@ |
| 55 | + echo $(OX)\bag$O >> $@ |
| 56 | + echo $(OX)\bisect$O >> $@ |
| 57 | + echo $(OX)\blob$O >> $@ |
| 58 | + echo $(OX)\branch$O >> $@ |
| 59 | + echo $(OX)\browse$O >> $@ |
| 60 | + echo $(OX)\captcha$O >> $@ |
| 61 | + echo $(OX)\cgi$O >> $@ |
| 62 | + echo $(OX)\checkin$O >> $@ |
| 63 | + echo $(OX)\checkout$O >> $@ |
| 64 | + echo $(OX)\clearsign$O >> $@ |
| 65 | + echo $(OX)\clone$O >> $@ |
| 66 | + echo $(OX)\comformat$O >> $@ |
| 67 | + echo $(OX)\configure$O >> $@ |
| 68 | + echo $(OX)\content$O >> $@ |
| 69 | + echo $(OX)\db$O >> $@ |
| 70 | + echo $(OX)\delta$O >> $@ |
| 71 | + echo $(OX)\deltacmd$O >> $@ |
| 72 | + echo $(OX)\descendants$O >> $@ |
| 73 | + echo $(OX)\diff$O >> $@ |
| 74 | + echo $(OX)\diffcmd$O >> $@ |
| 75 | + echo $(OX)\doc$O >> $@ |
| 76 | + echo $(OX)\encode$O >> $@ |
| 77 | + echo $(OX)\event$O >> $@ |
| 78 | + echo $(OX)\export$O >> $@ |
| 79 | + echo $(OX)\file$O >> $@ |
| 80 | + echo $(OX)\finfo$O >> $@ |
| 81 | + echo $(OX)\glob$O >> $@ |
| 82 | + echo $(OX)\graph$O >> $@ |
| 83 | + echo $(OX)\gzip$O >> $@ |
| 84 | + echo $(OX)\http$O >> $@ |
| 85 | + echo $(OX)\http_socket$O >> $@ |
| 86 | + echo $(OX)\http_ssl$O >> $@ |
| 87 | + echo $(OX)\http_transport$O >> $@ |
| 88 | + echo $(OX)\import$O >> $@ |
| 89 | + echo $(OX)\info$O >> $@ |
| 90 | + echo $(OX)\jimtcl$O >> $@ |
| 91 | + echo $(OX)\json$O >> $@ |
| 92 | + echo $(OX)\json_artifact$O >> $@ |
| 93 | + echo $(OX)\json_branch$O >> $@ |
| 94 | + echo $(OX)\json_diff$O >> $@ |
| 95 | + echo $(OX)\json_login$O >> $@ |
| 96 | + echo $(OX)\json_query$O >> $@ |
| 97 | + echo $(OX)\json_report$O >> $@ |
| 98 | + echo $(OX)\json_tag$O >> $@ |
| 99 | + echo $(OX)\json_timeline$O >> $@ |
| 100 | + echo $(OX)\json_user$O >> $@ |
| 101 | + echo $(OX)\json_wiki$O >> $@ |
| 102 | + echo $(OX)\leaf$O >> $@ |
| 103 | + echo $(OX)\login$O >> $@ |
| 104 | + echo $(OX)\main$O >> $@ |
| 105 | + echo $(OX)\manifest$O >> $@ |
| 106 | + echo $(OX)\md5$O >> $@ |
| 107 | + echo $(OX)\merge$O >> $@ |
| 108 | + echo $(OX)\merge3$O >> $@ |
| 109 | + echo $(OX)\name$O >> $@ |
| 110 | + echo $(OX)\path$O >> $@ |
| 111 | + echo $(OX)\pivot$O >> $@ |
| 112 | + echo $(OX)\popen$O >> $@ |
| 113 | + echo $(OX)\pqueue$O >> $@ |
| 114 | + echo $(OX)\printf$O >> $@ |
| 115 | + echo $(OX)\rebuild$O >> $@ |
| 116 | + echo $(OX)\report$O >> $@ |
| 117 | + echo $(OX)\rss$O >> $@ |
| 118 | + echo $(OX)\schema$O >> $@ |
| 119 | + echo $(OX)\search$O >> $@ |
| 120 | + echo $(OX)\setup$O >> $@ |
| 121 | + echo $(OX)\sha1$O >> $@ |
| 122 | + echo $(OX)\shell$O >> $@ |
| 123 | + echo $(OX)\shun$O >> $@ |
| 124 | + echo $(OX)\skins$O >> $@ |
| 125 | + echo $(OX)\sqlcmd$O >> $@ |
| 126 | + echo $(OX)\sqlite3$O >> $@ |
| 127 | + echo $(OX)\stash$O >> $@ |
| 128 | + echo $(OX)\stat$O >> $@ |
| 129 | + echo $(OX)\style$O >> $@ |
| 130 | + echo $(OX)\sync$O >> $@ |
| 131 | + echo $(OX)\tag$O >> $@ |
| 132 | + echo $(OX)\tar$O >> $@ |
| 133 | + echo $(OX)\th_main$O >> $@ |
| 134 | + echo $(OX)\timeline$O >> $@ |
| 135 | + echo $(OX)\tkt$O >> $@ |
| 136 | + echo $(OX)\tktsetup$O >> $@ |
| 137 | + echo $(OX)\undo$O >> $@ |
| 138 | + echo $(OX)\update$O >> $@ |
| 139 | + echo $(OX)\url$O >> $@ |
| 140 | + echo $(OX)\user$O >> $@ |
| 141 | + echo $(OX)\verify$O >> $@ |
| 142 | + echo $(OX)\vfile$O >> $@ |
| 143 | + echo $(OX)\wiki$O >> $@ |
| 144 | + echo $(OX)\wikiformat$O >> $@ |
| 145 | + echo $(OX)\winhttp$O >> $@ |
| 146 | + echo $(OX)\xfer$O >> $@ |
| 147 | + echo $(OX)\zip$O >> $@ |
| 152 | 148 | echo $(LIBS) >> $@ |
| 153 | 149 | |
| 154 | 150 | |
| 155 | 151 | |
| 156 | 152 | |
| | @@ -173,16 +169,10 @@ |
| 173 | 169 | $(TCC) /Fo$@ /Dmain=sqlite3_shell $(SQLITE_OPTIONS) -c $(SRCDIR)\shell.c |
| 174 | 170 | |
| 175 | 171 | $(OX)\sqlite3$O : $(SRCDIR)\sqlite3.c |
| 176 | 172 | $(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $** |
| 177 | 173 | |
| 178 | | -$(OX)\th$O : $(SRCDIR)\th.c |
| 179 | | - $(TCC) /Fo$@ -c $** |
| 180 | | - |
| 181 | | -$(OX)\th_lang$O : $(SRCDIR)\th_lang.c |
| 182 | | - $(TCC) /Fo$@ -c $** |
| 183 | | - |
| 184 | 174 | VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION |
| 185 | 175 | $** > $@ |
| 186 | 176 | $(OBJDIR)\cson_amalgamation.h : $(SRCDIR)\cson_amalgamation.h |
| 187 | 177 | cp $(SRCDIR)\cson_amalgamation.h $@ |
| 188 | 178 | |
| | @@ -436,10 +426,13 @@ |
| 436 | 426 | $(TCC) /Fo$@ -c info_.c |
| 437 | 427 | |
| 438 | 428 | info_.c : $(SRCDIR)\info.c |
| 439 | 429 | translate$E $** > $@ |
| 440 | 430 | |
| 431 | +$(OX)\jimtcl$O : $(SRCDIR)\..\autosetup\jimsh0.c |
| 432 | + $(TCC) /Fo$@ /DJIM_BOOTSTRAP_LIB_ONLY -c $(SRCDIR)\..\autosetup\jimsh0.c |
| 433 | + |
| 441 | 434 | $(OX)\json$O : json_.c json.h |
| 442 | 435 | $(TCC) /Fo$@ -c json_.c |
| 443 | 436 | |
| 444 | 437 | json_.c : $(SRCDIR)\json.c |
| 445 | 438 | translate$E $** > $@ |
| 446 | 439 | |