/ Check-in [7a8b0e36]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:More corrections to VS 2013 integration.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | vsix2013
Files: files | file ages | folders
SHA1: 7a8b0e362b529d54231453046f22e90e651ecdc5
User & Date: mistachkin 2013-07-10 21:33:25
Original Comment: More corrects to VS 2013 integration.
Context
2013-07-11
03:09
Environment variable names in nmake must be in all uppercase. check-in: 0328e873 user: mistachkin tags: vsix2013
2013-07-10
21:33
More corrections to VS 2013 integration. check-in: 7a8b0e36 user: mistachkin tags: vsix2013
19:53
Use the VisualStudioVersion variable instead of _MSC_VER. check-in: 603e9db8 user: mistachkin tags: vsix2013
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.msc.

   443    443   # linker option must be used to mark the executable as runnable
   444    444   # only in the context of an application container.
   445    445   #
   446    446   !IF $(FOR_WINRT)!=0
   447    447   LTLINKOPTS = $(LTLINKOPTS) /APPCONTAINER
   448    448   !IF "$(VisualStudioVersion)"=="12.0"
   449    449   !IF "$(PLATFORM)"=="x86"
   450         -LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(VCINSTALLDIR)\store"
          450  +LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(VCINSTALLDIR)\lib\store"
   451    451   !ELSEIF "$(PLATFORM)"=="x64"
   452         -LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(VCINSTALLDIR)\store\amd64"
   453         -!ELSEIF "$(PLATFORM)"=="arm"
   454         -LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(VCINSTALLDIR)\store\arm"
          452  +LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(VCINSTALLDIR)\lib\store\amd64"
          453  +!ELSEIF "$(PLATFORM)"=="ARM"
          454  +LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(VCINSTALLDIR)\lib\store\arm"
          455  +!ELSE
          456  +LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(VCINSTALLDIR)\lib\store"
   455    457   !ENDIF
   456    458   !ENDIF
   457    459   !ENDIF
   458    460   
   459    461   # If either debugging or symbols are enabled, enable PDBs.
   460    462   !IF $(DEBUG)>0 || $(SYMBOLS)!=0
   461    463   LDFLAGS = /DEBUG