Fossil SCM

Minor changes to win/Makefile.msc after testing with MSVC.

shaneh 2010-08-31 18:21 trunk
Commit 3a5b4ad4e2dbf8ef6b020c4fe7927f3f23b3f0c4
Parent b0bbcd5da616c0d…
2 files changed +23 -14 +23 -14
~ src/makemake.tcl ~ win/Makefile.msc
M src/makemake.tcl
+23 -14
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -333,29 +333,38 @@
333333
 SRCDIR = $B\src
334334
 OBJDIR = .
335335
 O = .obj
336336
 E = .exe
337337
338
-
339
-# Maybe MSCDIR, SSL or INCL needs adjustment
338
+# Maybe MSCDIR, SSL, ZLIB, or INCL needs adjustment
340339
 MSCDIR = c:\msc
341
-INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include
340
+
341
+# Uncomment below for SSL support
342
+SSL =
343
+SSLLIB =
344
+#SSL = -DFOSSIL_ENABLE_SSL=1
345
+#SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib advapi32.lib
346
+
347
+# zlib options
348
+# When using precompiled from http://zlib.net/zlib125-dll.zip
349
+#ZINCDIR = C:\zlib125-dll\include
350
+#ZLIBDIR = C:\zlib125-dll\lib
351
+#ZLIB = zdll.lib
352
+ZINCDIR = $(MSCDIR)\extra\include
353
+ZLIBDIR = $(MSCDIR)\extra\lib
354
+ZLIB = zlib.lib
342355
343
-#SSL = -DFOSSIL_ENABLE_SSL=1
344
-SSL =
356
+INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
345357
346358
 MSCDEF = -Dstrncasecmp=memicmp -Dstrcasecmp=stricmp
347359
 I18N = -DFOSSIL_I18N=0
348360
349
-CFLAGS = -nologo -MD -O2 -Oy- -Zi
350361
 CFLAGS = -nologo -MT -O2
351362
 BCC = $(CC) $(CFLAGS)
352363
 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(I18N) $(SSL) $(INCL)
353
-LIBS = zlib.lib ws2_32.lib
354
-##SSL uncoment below
355
-#LIBS = zlib.lib ws2_32.lib ssleay32.lib libeay32.lib user32.lib gdi32.lib advapi32.lib
356
-LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib
364
+LIBS = $(ZLIB) ws2_32.lib $(SSLLIB)
365
+LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
357366
 }
358367
 puts -nonewline "SRC = "
359368
 foreach s [lsort $src] {
360369
 puts -nonewline "${s}_.c "
361370
 }
@@ -369,24 +378,23 @@
369378
370379
 APPNAME = $(OBJDIR)\fossil$(E)
371380
372381
 all: $(OBJDIR) $(APPNAME)
373382
374
-$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\link
383
+$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\linkopts
375384
 cd $(OBJDIR)
376
- link -LINK -OUT:$@ $(LIBDIR) @link
385
+ link -LINK -OUT:$@ $(LIBDIR) @linkopts
377386
378
-$(OBJDIR)\link:}
387
+$(OBJDIR)\linkopts: $B\win\Makefile.msc}
379388
 puts -nonewline "\techo "
380389
 foreach s [lsort $src] {
381390
 puts -nonewline "$s "
382391
 }
383392
 puts "sqlite3 th th_lang > \$@"
384393
 puts "\techo \$(LIBS) >> \$@\n\n"
385394
386395
 puts {
387
-
388396
389397
 $(OBJDIR):
390398
 @-mkdir $@
391399
392400
 translate$E: $(SRCDIR)\translate.c
@@ -417,10 +425,11 @@
417425
 $** > $@
418426
419427
 clean:
420428
 -del $(OBJDIR)\*.obj
421429
 -del *.obj *_.c *.h *.map
430
+ -del headers linkopts
422431
423432
 realclean:
424433
 -del $(APPNAME) translate$E mkindex$E makeheaders$E version$E
425434
426435
 }
427436
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -333,29 +333,38 @@
333 SRCDIR = $B\src
334 OBJDIR = .
335 O = .obj
336 E = .exe
337
338
339 # Maybe MSCDIR, SSL or INCL needs adjustment
340 MSCDIR = c:\msc
341 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include
 
 
 
 
 
 
 
 
 
 
 
 
 
 
342
343 #SSL = -DFOSSIL_ENABLE_SSL=1
344 SSL =
345
346 MSCDEF = -Dstrncasecmp=memicmp -Dstrcasecmp=stricmp
347 I18N = -DFOSSIL_I18N=0
348
349 CFLAGS = -nologo -MD -O2 -Oy- -Zi
350 CFLAGS = -nologo -MT -O2
351 BCC = $(CC) $(CFLAGS)
352 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(I18N) $(SSL) $(INCL)
353 LIBS = zlib.lib ws2_32.lib
354 ##SSL uncoment below
355 #LIBS = zlib.lib ws2_32.lib ssleay32.lib libeay32.lib user32.lib gdi32.lib advapi32.lib
356 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib
357 }
358 puts -nonewline "SRC = "
359 foreach s [lsort $src] {
360 puts -nonewline "${s}_.c "
361 }
@@ -369,24 +378,23 @@
369
370 APPNAME = $(OBJDIR)\fossil$(E)
371
372 all: $(OBJDIR) $(APPNAME)
373
374 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\link
375 cd $(OBJDIR)
376 link -LINK -OUT:$@ $(LIBDIR) @link
377
378 $(OBJDIR)\link:}
379 puts -nonewline "\techo "
380 foreach s [lsort $src] {
381 puts -nonewline "$s "
382 }
383 puts "sqlite3 th th_lang > \$@"
384 puts "\techo \$(LIBS) >> \$@\n\n"
385
386 puts {
387
388
389 $(OBJDIR):
390 @-mkdir $@
391
392 translate$E: $(SRCDIR)\translate.c
@@ -417,10 +425,11 @@
417 $** > $@
418
419 clean:
420 -del $(OBJDIR)\*.obj
421 -del *.obj *_.c *.h *.map
 
422
423 realclean:
424 -del $(APPNAME) translate$E mkindex$E makeheaders$E version$E
425
426 }
427
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -333,29 +333,38 @@
333 SRCDIR = $B\src
334 OBJDIR = .
335 O = .obj
336 E = .exe
337
338 # Maybe MSCDIR, SSL, ZLIB, or INCL needs adjustment
 
339 MSCDIR = c:\msc
340
341 # Uncomment below for SSL support
342 SSL =
343 SSLLIB =
344 #SSL = -DFOSSIL_ENABLE_SSL=1
345 #SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib advapi32.lib
346
347 # zlib options
348 # When using precompiled from http://zlib.net/zlib125-dll.zip
349 #ZINCDIR = C:\zlib125-dll\include
350 #ZLIBDIR = C:\zlib125-dll\lib
351 #ZLIB = zdll.lib
352 ZINCDIR = $(MSCDIR)\extra\include
353 ZLIBDIR = $(MSCDIR)\extra\lib
354 ZLIB = zlib.lib
355
356 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
 
357
358 MSCDEF = -Dstrncasecmp=memicmp -Dstrcasecmp=stricmp
359 I18N = -DFOSSIL_I18N=0
360
 
361 CFLAGS = -nologo -MT -O2
362 BCC = $(CC) $(CFLAGS)
363 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(I18N) $(SSL) $(INCL)
364 LIBS = $(ZLIB) ws2_32.lib $(SSLLIB)
365 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
 
 
366 }
367 puts -nonewline "SRC = "
368 foreach s [lsort $src] {
369 puts -nonewline "${s}_.c "
370 }
@@ -369,24 +378,23 @@
378
379 APPNAME = $(OBJDIR)\fossil$(E)
380
381 all: $(OBJDIR) $(APPNAME)
382
383 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\linkopts
384 cd $(OBJDIR)
385 link -LINK -OUT:$@ $(LIBDIR) @linkopts
386
387 $(OBJDIR)\linkopts: $B\win\Makefile.msc}
388 puts -nonewline "\techo "
389 foreach s [lsort $src] {
390 puts -nonewline "$s "
391 }
392 puts "sqlite3 th th_lang > \$@"
393 puts "\techo \$(LIBS) >> \$@\n\n"
394
395 puts {
 
396
397 $(OBJDIR):
398 @-mkdir $@
399
400 translate$E: $(SRCDIR)\translate.c
@@ -417,10 +425,11 @@
425 $** > $@
426
427 clean:
428 -del $(OBJDIR)\*.obj
429 -del *.obj *_.c *.h *.map
430 -del headers linkopts
431
432 realclean:
433 -del $(APPNAME) translate$E mkindex$E makeheaders$E version$E
434
435 }
436
M win/Makefile.msc
+23 -14
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -8,29 +8,38 @@
88
 SRCDIR = $B\src
99
 OBJDIR = .
1010
 O = .obj
1111
 E = .exe
1212
13
-
14
-# Maybe MSCDIR, SSL or INCL needs adjustment
13
+# Maybe MSCDIR, SSL, ZLIB, or INCL needs adjustment
1514
 MSCDIR = c:\msc
16
-INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include
1715
18
-#SSL = -DFOSSIL_ENABLE_SSL=1
19
-SSL =
16
+# Uncomment below for SSL support
17
+SSL =
18
+SSLLIB =
19
+#SSL = -DFOSSIL_ENABLE_SSL=1
20
+#SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib advapi32.lib
21
+
22
+# zlib options
23
+# When using precompiled from http://zlib.net/zlib125-dll.zip
24
+#ZINCDIR = C:\zlib125-dll\include
25
+#ZLIBDIR = C:\zlib125-dll\lib
26
+#ZLIB = zdll.lib
27
+ZINCDIR = $(MSCDIR)\extra\include
28
+ZLIBDIR = $(MSCDIR)\extra\lib
29
+ZLIB = zlib.lib
30
+
31
+INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
2032
2133
 MSCDEF = -Dstrncasecmp=memicmp -Dstrcasecmp=stricmp
2234
 I18N = -DFOSSIL_I18N=0
2335
24
-CFLAGS = -nologo -MD -O2 -Oy- -Zi
2536
 CFLAGS = -nologo -MT -O2
2637
 BCC = $(CC) $(CFLAGS)
2738
 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(I18N) $(SSL) $(INCL)
28
-LIBS = zlib.lib ws2_32.lib
29
-##SSL uncoment below
30
-#LIBS = zlib.lib ws2_32.lib ssleay32.lib libeay32.lib user32.lib gdi32.lib advapi32.lib
31
-LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib
39
+LIBS = $(ZLIB) ws2_32.lib $(SSLLIB)
40
+LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
3241
3342
 SRC = add_.c allrepo_.c attach_.c bag_.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 file_.c finfo_.c graph_.c http_.c http_socket_.c http_ssl_.c http_transport_.c info_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.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 stat_.c style_.c sync_.c tag_.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
3443
3544
 OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\info$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
3645
@@ -37,18 +46,17 @@
3746
3847
 APPNAME = $(OBJDIR)\fossil$(E)
3948
4049
 all: $(OBJDIR) $(APPNAME)
4150
42
-$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\link
51
+$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\linkopts
4352
 cd $(OBJDIR)
44
- link -LINK -OUT:$@ $(LIBDIR) @link
53
+ link -LINK -OUT:$@ $(LIBDIR) @linkopts
4554
46
-$(OBJDIR)\link:
55
+$(OBJDIR)\linkopts: $B\win\Makefile.msc
4756
 echo add allrepo attach bag blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode file finfo graph http http_socket http_ssl http_transport info login main manifest md5 merge merge3 name pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins stat style sync tag th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip sqlite3 th th_lang > $@
4857
 echo $(LIBS) >> $@
49
-
5058
5159
5260
5361
5462
 $(OBJDIR):
@@ -82,10 +90,11 @@
8290
 $** > $@
8391
8492
 clean:
8593
 -del $(OBJDIR)\*.obj
8694
 -del *.obj *_.c *.h *.map
95
+ -del headers linkopts
8796
8897
 realclean:
8998
 -del $(APPNAME) translate$E mkindex$E makeheaders$E version$E
9099
91100
92101
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -8,29 +8,38 @@
8 SRCDIR = $B\src
9 OBJDIR = .
10 O = .obj
11 E = .exe
12
13
14 # Maybe MSCDIR, SSL or INCL needs adjustment
15 MSCDIR = c:\msc
16 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include
17
18 #SSL = -DFOSSIL_ENABLE_SSL=1
19 SSL =
 
 
 
 
 
 
 
 
 
 
 
 
 
 
20
21 MSCDEF = -Dstrncasecmp=memicmp -Dstrcasecmp=stricmp
22 I18N = -DFOSSIL_I18N=0
23
24 CFLAGS = -nologo -MD -O2 -Oy- -Zi
25 CFLAGS = -nologo -MT -O2
26 BCC = $(CC) $(CFLAGS)
27 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(I18N) $(SSL) $(INCL)
28 LIBS = zlib.lib ws2_32.lib
29 ##SSL uncoment below
30 #LIBS = zlib.lib ws2_32.lib ssleay32.lib libeay32.lib user32.lib gdi32.lib advapi32.lib
31 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib
32
33 SRC = add_.c allrepo_.c attach_.c bag_.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 file_.c finfo_.c graph_.c http_.c http_socket_.c http_ssl_.c http_transport_.c info_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.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 stat_.c style_.c sync_.c tag_.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
34
35 OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\info$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
36
@@ -37,18 +46,17 @@
37
38 APPNAME = $(OBJDIR)\fossil$(E)
39
40 all: $(OBJDIR) $(APPNAME)
41
42 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\link
43 cd $(OBJDIR)
44 link -LINK -OUT:$@ $(LIBDIR) @link
45
46 $(OBJDIR)\link:
47 echo add allrepo attach bag blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode file finfo graph http http_socket http_ssl http_transport info login main manifest md5 merge merge3 name pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins stat style sync tag th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip sqlite3 th th_lang > $@
48 echo $(LIBS) >> $@
49
50
51
52
53
54 $(OBJDIR):
@@ -82,10 +90,11 @@
82 $** > $@
83
84 clean:
85 -del $(OBJDIR)\*.obj
86 -del *.obj *_.c *.h *.map
 
87
88 realclean:
89 -del $(APPNAME) translate$E mkindex$E makeheaders$E version$E
90
91
92
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -8,29 +8,38 @@
8 SRCDIR = $B\src
9 OBJDIR = .
10 O = .obj
11 E = .exe
12
13 # Maybe MSCDIR, SSL, ZLIB, or INCL needs adjustment
 
14 MSCDIR = c:\msc
 
15
16 # Uncomment below for SSL support
17 SSL =
18 SSLLIB =
19 #SSL = -DFOSSIL_ENABLE_SSL=1
20 #SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib advapi32.lib
21
22 # zlib options
23 # When using precompiled from http://zlib.net/zlib125-dll.zip
24 #ZINCDIR = C:\zlib125-dll\include
25 #ZLIBDIR = C:\zlib125-dll\lib
26 #ZLIB = zdll.lib
27 ZINCDIR = $(MSCDIR)\extra\include
28 ZLIBDIR = $(MSCDIR)\extra\lib
29 ZLIB = zlib.lib
30
31 INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
32
33 MSCDEF = -Dstrncasecmp=memicmp -Dstrcasecmp=stricmp
34 I18N = -DFOSSIL_I18N=0
35
 
36 CFLAGS = -nologo -MT -O2
37 BCC = $(CC) $(CFLAGS)
38 TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(I18N) $(SSL) $(INCL)
39 LIBS = $(ZLIB) ws2_32.lib $(SSLLIB)
40 LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
 
 
41
42 SRC = add_.c allrepo_.c attach_.c bag_.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 file_.c finfo_.c graph_.c http_.c http_socket_.c http_ssl_.c http_transport_.c info_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.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 stat_.c style_.c sync_.c tag_.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
43
44 OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\info$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
45
@@ -37,18 +46,17 @@
46
47 APPNAME = $(OBJDIR)\fossil$(E)
48
49 all: $(OBJDIR) $(APPNAME)
50
51 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\linkopts
52 cd $(OBJDIR)
53 link -LINK -OUT:$@ $(LIBDIR) @linkopts
54
55 $(OBJDIR)\linkopts: $B\win\Makefile.msc
56 echo add allrepo attach bag blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode file finfo graph http http_socket http_ssl http_transport info login main manifest md5 merge merge3 name pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins stat style sync tag th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip sqlite3 th th_lang > $@
57 echo $(LIBS) >> $@
 
58
59
60
61
62 $(OBJDIR):
@@ -82,10 +90,11 @@
90 $** > $@
91
92 clean:
93 -del $(OBJDIR)\*.obj
94 -del *.obj *_.c *.h *.map
95 -del headers linkopts
96
97 realclean:
98 -del $(APPNAME) translate$E mkindex$E makeheaders$E version$E
99
100
101

Keyboard Shortcuts

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