From: mistachkin <mistachkin@noemail.net>
Date: Mon, 3 Sep 2012 11:01:21 +0000 (+0000)
Subject: Linking and cleaning fixes for the tclsqlite3.exe target in the MSVC makefile.
X-Git-Tag: version-3.7.14~2^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f104d57005d313ad44248e71b4242844a43e44f;p=thirdparty%2Fsqlite.git

Linking and cleaning fixes for the tclsqlite3.exe target in the MSVC makefile.

FossilOrigin-Name: 96d43c7a35684cd8ca6ac0d8325193e69f102fb8
---

diff --git a/Makefile.msc b/Makefile.msc
index bc80e27c8c..f688fa2fcc 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1044,8 +1044,7 @@ tclsqlite-shell.lo:	$(TOP)\src\tclsqlite.c $(HDR)
 	$(LTCOMPILE) -DTCLSH=1 -DBUILD_sqlite -I$(TCLINCDIR) -c $(TOP)\src\tclsqlite.c
 
 tclsqlite3.exe:	tclsqlite-shell.lo libsqlite3.lib sqlite3res.lo
-	$(LTLINK) tclsqlite-shell.lo \
-		/link $(LTLINKOPTS) $(LTLIBPATHS) libsqlite3.lib sqlite3res.lo $(LTLIBS) $(TLIBS)
+	$(LD) $(LDFLAGS) $(LTLINKOPTS) $(LTLIBPATHS) /OUT:$@ libsqlite3.lib tclsqlite-shell.lo sqlite3res.lo $(LTLIBS) $(TLIBS)
 
 # Rules to build opcodes.c and opcodes.h
 #
@@ -1197,7 +1196,7 @@ clean:
 	-rmdir /Q/S quota2c
 	-rmdir /Q/S tsrc
 	del /Q .target_source
-	del /Q tclsqlite3.exe
+	del /Q tclsqlite3.exe tclsqlite3.exp
 	del /Q testfixture.exe testfixture.exp test.db
 	del /Q sqlite3.dll sqlite3.lib sqlite3.exp sqlite3.def
 	del /Q sqlite3.c
diff --git a/manifest b/manifest
index 02deface94..252fe7dbed 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Add\sWin32\sversion\sresources\sto\sthe\sapplicable\sbinaries\sbuilt\sby\sthe\sMSVC\smakefile.
-D 2012-09-03T10:32:32.046
+C Linking\sand\scleaning\sfixes\sfor\sthe\stclsqlite3.exe\starget\sin\sthe\sMSVC\smakefile.
+D 2012-09-03T11:01:21.786
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc d6127b1d8488a7733a23c89175ab9b7899987adf
+F Makefile.msc 494e71889c5f3480c53b83e3c42156ac17c99d68
 F Makefile.vxworks 879f034a64062a364b21000266bbd5bc6e0c19b9
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 F VERSION a71848df48082f1d6585d4b0819d530fc455485d
@@ -1014,10 +1014,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P 7536101317c00fbb5bf555120feb55b9bc40e8ba
-R 24121e4a9d0fc498cf79976cfed87444
-T *branch * win32Resources
-T *sym-win32Resources *
-T -sym-trunk *
+P e2f27d28b590164bc6b0d856e79c9345e2188d03
+R 45efbc31964d33080b484210f8dbf86c
 U mistachkin
-Z 3bf23bfb661a7d15378c710920999b0d
+Z 5f858f893a53076d6a54458ec310e24b
diff --git a/manifest.uuid b/manifest.uuid
index fc61106319..0db4ee0bbb 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e2f27d28b590164bc6b0d856e79c9345e2188d03
\ No newline at end of file
+96d43c7a35684cd8ca6ac0d8325193e69f102fb8
\ No newline at end of file