From: mistachkin <mistachkin@noemail.net>
Date: Wed, 10 Feb 2016 21:45:25 +0000 (+0000)
Subject: In the MSVC makefile, include the working directory so that it can pickup build gener... 
X-Git-Tag: version-3.11.0~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8988aeef607f1b39e1176d148d8ac786049a3c92;p=thirdparty%2Fsqlite.git

In the MSVC makefile, include the working directory so that it can pickup build generated files (e.g. sqlite3.h, etc).

FossilOrigin-Name: e9e6000bd2f7e0ef85178db2b5b8f20e4cf0093c
---

diff --git a/Makefile.msc b/Makefile.msc
index 82f405db3b..07319eac94 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -414,8 +414,8 @@ TCC = $(CC) -nologo -W4 -DINCLUDE_MSVC_H=1 $(CCOPTS) $(TCCOPTS)
 TCC = $(CC) -nologo -W3 $(CCOPTS) $(TCCOPTS)
 !ENDIF
 
-TCC = $(TCC) -DSQLITE_OS_WIN=1 -I$(TOP) -I$(TOP)\src -fp:precise
-RCC = $(RC) -DSQLITE_OS_WIN=1 -I$(TOP) -I$(TOP)\src $(RCOPTS) $(RCCOPTS)
+TCC = $(TCC) -DSQLITE_OS_WIN=1 -I. -I$(TOP) -I$(TOP)\src -fp:precise
+RCC = $(RC) -DSQLITE_OS_WIN=1 -I. -I$(TOP) -I$(TOP)\src $(RCOPTS) $(RCCOPTS)
 
 # Adjust the names of the primary targets for use with Windows 10.
 #
diff --git a/autoconf/Makefile.msc b/autoconf/Makefile.msc
index 3dfbb3d20e..d4035602d0 100644
--- a/autoconf/Makefile.msc
+++ b/autoconf/Makefile.msc
@@ -399,8 +399,8 @@ TCC = $(CC) -nologo -W4 -DINCLUDE_MSVC_H=1 $(CCOPTS) $(TCCOPTS)
 TCC = $(CC) -nologo -W3 $(CCOPTS) $(TCCOPTS)
 !ENDIF
 
-TCC = $(TCC) -DSQLITE_OS_WIN=1 -I$(TOP) -fp:precise
-RCC = $(RC) -DSQLITE_OS_WIN=1 -I$(TOP) $(RCOPTS) $(RCCOPTS)
+TCC = $(TCC) -DSQLITE_OS_WIN=1 -I. -I$(TOP) -fp:precise
+RCC = $(RC) -DSQLITE_OS_WIN=1 -I. -I$(TOP) $(RCOPTS) $(RCCOPTS)
 
 # Adjust the names of the primary targets for use with Windows 10.
 #
diff --git a/manifest b/manifest
index 3bec510d75..3c4770b096 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
-C Add\stestcase()\smacros\sto\sthe\sCHECK\sconstraint\savoidance\slogic.\s\sAvoid\screating\nan\sunused\sVDBE\slabel\sduring\sCHECK\sconstraint\scode\sgeneration.
-D 2016-02-10T19:10:50.227
+C In\sthe\sMSVC\smakefile,\sinclude\sthe\sworking\sdirectory\sso\sthat\sit\scan\spickup\sbuild\sgenerated\sfiles\s(e.g.\ssqlite3.h,\setc).
+D 2016-02-10T21:45:25.033
 F Makefile.in 4e90dc1521879022aa9479268a4cd141d1771142
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
-F Makefile.msc 0fe3b22f8e29bcde0533ada7957a5f15835d797a
+F Makefile.msc 463edfba5c6fccebc61d8c094ccd463a6a55becb
 F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
 F VERSION 866588d1edf0ccb5b0d33896974338f97564f719
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -11,7 +11,7 @@ F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am 29e2a6e8d0c5e32723a48b4faf6b168854dde5f4
-F autoconf/Makefile.msc 3ab11cf4b564876efad3f0d59528388e4329b88b
+F autoconf/Makefile.msc 6e27530281128adc3e51ce7f95dffbd1da7e64e1
 F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7
 F autoconf/README.txt 7325022e1cd497e1c3a525c97aa1020665e398cf
 F autoconf/configure.ac 72a5e42beb090b32bca580285dc0ab3c4670adb8
@@ -1427,7 +1427,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 7782cb1dd5914b867caf5ff2f0f837407abbfd7a
-R f678261a2391a665894eb0de22b6791f
-U drh
-Z 3c3c66a5988241bd4f12998cbe4ce5b2
+P 970881befd5da6cc837c474d6e917de0bf029350
+R 5eb3b947cad1b703762744d4a1125c44
+U mistachkin
+Z 4770d0013fc64e8d84870f88c904e1b8
diff --git a/manifest.uuid b/manifest.uuid
index 2e6049a80a..8eebb78161 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-970881befd5da6cc837c474d6e917de0bf029350
\ No newline at end of file
+e9e6000bd2f7e0ef85178db2b5b8f20e4cf0093c
\ No newline at end of file