Don't fail Windows Store initialization with non-default paths.

The previous code would do parts of Windows Store support initialization using 'default-path', and would fail in all cases where that returns false, in particular for 12.0_xp version. This patch moves that code to a different place, where explicit initialization path is available.
boostorg · Jun 3, 2015 · a0cf4ad · a0cf4ad
1 parent faea0e0
commit a0cf4ad
Showing 1 changed file with 11 additions and 12 deletions.
diff --git a/src/tools/msvc.jam b/src/tools/msvc.jam
@@ -281,18 +281,7 @@ rule configure-version-specific ( toolset : version : conditions )
         # dependencies to put there.
         toolset.flags $(toolset).link LINKFLAGS $(conditions) : /MANIFEST ;
     }
-
-    # Starting with Visual Studio 2013 the CRT is split into a desktop and app dll.
-    #If targeting WinRT and 12.0 set lib path to link against app CRT.
-    if [ MATCH "(12)" : $(version) ]
-    {
-        local VCPath = [ path.parent [ path.make [ default-path $(version) ] ] ] ;
-        local storeLibPath = [ path.join [ path.join $(VCPath) "lib" ] "store" ] ;
-        toolset.flags $(toolset).link LINKPATH $(conditions)/<windows-api>store/$(.cpu-arch-i386) : [ path.native $(storeLibPath) ] ;
-        toolset.flags $(toolset).link LINKPATH $(conditions)/<windows-api>store/$(.cpu-arch-amd64) : [ path.native [ path.join $(storeLibPath) "amd64" ] ] ;
-        toolset.flags $(toolset).link LINKPATH $(conditions)/<windows-api>store/$(.cpu-arch-arm) : [ path.native [ path.join $(storeLibPath) "arm" ] ] ;
-    }
-
+
     toolset.pop-checking-for-flags-module ;
 }
 
@@ -1176,6 +1165,16 @@ local rule configure-really ( version ? : options * )
             }
         }
 
+        # Starting with Visual Studio 2013 the CRT is split into a desktop and app dll.
+        # If targeting WinRT and 12.0 set lib path to link against app CRT.
+        if [ MATCH "(12)" : $(version) ]
+        {
+            local storeLibPath = [ path.join $(parent) "lib/store" ] ;
+            toolset.flags msvc.link LINKPATH $(conditions)/<windows-api>store/$(.cpu-arch-i386) : [ path.native $(storeLibPath) ] ;
+            toolset.flags msvc.link LINKPATH $(conditions)/<windows-api>store/$(.cpu-arch-amd64) : [ path.native [ path.join $(storeLibPath) "amd64" ] ] ;
+            toolset.flags msvc.link LINKPATH $(conditions)/<windows-api>store/$(.cpu-arch-arm) : [ path.native [ path.join $(storeLibPath) "arm" ] ] ;
+        }
+
         # Set version-specific flags.
         configure-version-specific msvc : $(version) : $(conditions) ;
     }