diff --git a/Makefile.msc b/Makefile.msc index 8e77e14a76..f2aa94644c 100644 --- a/Makefile.msc +++ b/Makefile.msc @@ -445,7 +445,7 @@ LTLIBOPTS = /MACHINE:$(PLATFORM) # !IF $(FOR_WINRT)!=0 LTLINKOPTS = $(LTLINKOPTS) /APPCONTAINER -!IF "$(VisualStudioVersion)"=="12.0" +!IF "$(VISUALSTUDIOVERSION)"=="12.0" !IF "$(PLATFORM)"=="x86" LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(VCINSTALLDIR)\lib\store" !ELSEIF "$(PLATFORM)"=="x64" diff --git a/manifest b/manifest index 1183d08667..3f096864ca 100644 --- a/manifest +++ b/manifest @@ -1,9 +1,9 @@ -C More\scorrects\sto\sVS\s2013\sintegration. -D 2013-07-10T21:33:25.856 +C Environment\svariable\snames\sin\snmake\smust\sbe\sin\sall\suppercase. +D 2013-07-11T03:09:45.896 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 -F Makefile.msc d45c66f73ed79474d5c3df44a48a9f06cdfd942f +F Makefile.msc 1b432129f87a6a4258f9b9e01ba5ccda0b19851a F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6 F VERSION 05c7bd63b96f31cfdef5c766ed91307ac121f5aa @@ -1093,7 +1093,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff -P 603e9db817d457e59e329ad55ac3f1e567759b32 -R f9815c19281fc25d64f0e7d7244efa66 +P 7a8b0e362b529d54231453046f22e90e651ecdc5 +R ff249db1b0f16f46ad7ee4ebeeb16b40 U mistachkin -Z fdae0f9dfe136531de23272d34a5b71e +Z 80027817d1c05a21c407e2d8f86e9a15 diff --git a/manifest.uuid b/manifest.uuid index 30c1bd2520..aaeecb4f34 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -7a8b0e362b529d54231453046f22e90e651ecdc5 \ No newline at end of file +0328e873f2f98ac0aed93ec07ba7e14228cc10e0 \ No newline at end of file