More corrects to VS 2013 integration.

FossilOrigin-Name: 7a8b0e362b529d54231453046f22e90e651ecdc5
This commit is contained in:
mistachkin
2013-07-10 21:33:25 +00:00
parent 6cdc63d4e3
commit 4eaa1295c9
3 changed files with 13 additions and 11 deletions
+6 -4
View File
@@ -447,11 +447,13 @@ LTLIBOPTS = /MACHINE:$(PLATFORM)
LTLINKOPTS = $(LTLINKOPTS) /APPCONTAINER
!IF "$(VisualStudioVersion)"=="12.0"
!IF "$(PLATFORM)"=="x86"
LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(VCINSTALLDIR)\store"
LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(VCINSTALLDIR)\lib\store"
!ELSEIF "$(PLATFORM)"=="x64"
LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(VCINSTALLDIR)\store\amd64"
!ELSEIF "$(PLATFORM)"=="arm"
LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(VCINSTALLDIR)\store\arm"
LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(VCINSTALLDIR)\lib\store\amd64"
!ELSEIF "$(PLATFORM)"=="ARM"
LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(VCINSTALLDIR)\lib\store\arm"
!ELSE
LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(VCINSTALLDIR)\lib\store"
!ENDIF
!ENDIF
!ENDIF
+6 -6
View File
@@ -1,9 +1,9 @@
C Use\sthe\sVisualStudioVersion\svariable\sinstead\sof\s_MSC_VER.
D 2013-07-10T19:53:49.176
C More\scorrects\sto\sVS\s2013\sintegration.
D 2013-07-10T21:33:25.856
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
F Makefile.msc 2c391a8c3e3e941df2670499225e56a2665b6743
F Makefile.msc d45c66f73ed79474d5c3df44a48a9f06cdfd942f
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 29c458e2c21f7c8db727fe8dbd4d154918b53a4e
R 1fc16d780ab429b1ac8777f58708e855
P 603e9db817d457e59e329ad55ac3f1e567759b32
R f9815c19281fc25d64f0e7d7244efa66
U mistachkin
Z c5cda1e51e4d22d5432eaa97bb145bf4
Z fdae0f9dfe136531de23272d34a5b71e
+1 -1
View File
@@ -1 +1 @@
603e9db817d457e59e329ad55ac3f1e567759b32
7a8b0e362b529d54231453046f22e90e651ecdc5