Fossil SCM

Update the MSVC makefile so that it works with the new "service" command.

drh 2011-07-18 20:00 UTC tsbg-win-service

Commit 4bf9048e25b88f63c1d934945a3c4f3f0e8c963c

Parent 91c2f65a6e70581…

2 files changed +1 -1 +1 -1

M src/makemake.tcl

+1 -1

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -653,11 +653,11 @@
653	653	INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
654	654
655	655	CFLAGS = -nologo -MT -O2
656	656	BCC = $(CC) $(CFLAGS)
657	657	TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
658		-LIBS = $(ZLIB) ws2_32.lib $(SSLLIB)
	658	+LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
659	659	LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
660	660	}
661	661	regsub -all {[-]D} $SQLITE_OPTIONS {/D} MSC_SQLITE_OPTIONS
662	662	writeln "SQLITE_OPTIONS = $MSC_SQLITE_OPTIONS\n"
663	663	writeln -nonewline "SRC = "
664	664

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -653,11 +653,11 @@
653	INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
654
655	CFLAGS = -nologo -MT -O2
656	BCC = $(CC) $(CFLAGS)
657	TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
658	LIBS = $(ZLIB) ws2_32.lib $(SSLLIB)
659	LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
660	}
661	regsub -all {[-]D} $SQLITE_OPTIONS {/D} MSC_SQLITE_OPTIONS
662	writeln "SQLITE_OPTIONS = $MSC_SQLITE_OPTIONS\n"
663	writeln -nonewline "SRC = "
664

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -653,11 +653,11 @@
653	INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
654
655	CFLAGS = -nologo -MT -O2
656	BCC = $(CC) $(CFLAGS)
657	TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
658	LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
659	LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
660	}
661	regsub -all {[-]D} $SQLITE_OPTIONS {/D} MSC_SQLITE_OPTIONS
662	writeln "SQLITE_OPTIONS = $MSC_SQLITE_OPTIONS\n"
663	writeln -nonewline "SRC = "
664

M win/Makefile.msc

+1 -1

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -31,11 +31,11 @@
31	31	INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
32	32
33	33	CFLAGS = -nologo -MT -O2
34	34	BCC = $(CC) $(CFLAGS)
35	35	TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
36		-LIBS = $(ZLIB) ws2_32.lib $(SSLLIB)
	36	+LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
37	37	LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
38	38
39	39	SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 /DSQLITE_THREADSAFE=0 /DSQLITE_DEFAULT_FILE_FORMAT=4 /DSQLITE_ENABLE_STAT2 /Dlocaltime=fossil_localtime /DSQLITE_ENABLE_LOCKING_STYLE=0
40	40
41	41	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 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	42

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -31,11 +31,11 @@
31	INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
32
33	CFLAGS = -nologo -MT -O2
34	BCC = $(CC) $(CFLAGS)
35	TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
36	LIBS = $(ZLIB) ws2_32.lib $(SSLLIB)
37	LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
38
39	SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 /DSQLITE_THREADSAFE=0 /DSQLITE_DEFAULT_FILE_FORMAT=4 /DSQLITE_ENABLE_STAT2 /Dlocaltime=fossil_localtime /DSQLITE_ENABLE_LOCKING_STYLE=0
40
41	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 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

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -31,11 +31,11 @@
31	INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
32
33	CFLAGS = -nologo -MT -O2
34	BCC = $(CC) $(CFLAGS)
35	TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
36	LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
37	LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
38
39	SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 /DSQLITE_THREADSAFE=0 /DSQLITE_DEFAULT_FILE_FORMAT=4 /DSQLITE_ENABLE_STAT2 /Dlocaltime=fossil_localtime /DSQLITE_ENABLE_LOCKING_STYLE=0
40
41	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 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