[[ Bug 20603 ]] Ensure library mapping section comes before modules

livecodeali · livecodeali · commit fbd77217584a · 2017-10-26T00:51:50.000+01:00
We need to use the library mapping to find modules' resource folders
so put the library mapping section beforehand.
diff --git a/engine/src/deploy.cpp b/engine/src/deploy.cpp
@@ -523,6 +523,17 @@ bool MCDeployWriteCapsule(const MCDeployParameters& p_params, MCDeployFileRef p_
             /* UNCHECKED */ MCArrayFetchValueAtIndex(p_params.redirects, i + 1, t_val);
 			t_success = MCDeployCapsuleDefineString(t_capsule, kMCCapsuleSectionTypeRedirect, (MCStringRef)t_val);
 		}
+
+    ////////
+    
+    // AL-2015-02-10: [[ Standalone Inclusions ]] Add the resource mappings, if any.
+    if (t_success)
+        for(uindex_t i = 0; i < MCArrayGetCount(p_params.library) && t_success; i++)
+        {
+            MCValueRef t_val;
+            /* UNCHECKED */ MCArrayFetchValueAtIndex(p_params.library, i + 1, t_val);
+            t_success = MCDeployCapsuleDefineString(t_capsule, kMCCapsuleSectionTypeLibrary, (MCStringRef)t_val);
+        }
     
     ////////
     
@@ -572,16 +583,7 @@ bool MCDeployWriteCapsule(const MCDeployParameters& p_params, MCDeployFileRef p_
 			if (t_success)
                 t_success = MCDeployCapsuleDefineFromStackFile(t_capsule, (MCStringRef)t_val, t_aux_stackfiles[i], false);
 		}
-	
-    // AL-2015-02-10: [[ Standalone Inclusions ]] Add the resource mappings, if any.
-    if (t_success)
-        for(uindex_t i = 0; i < MCArrayGetCount(p_params.library) && t_success; i++)
-        {
-            MCValueRef t_val;
-            /* UNCHECKED */ MCArrayFetchValueAtIndex(p_params.library, i + 1, t_val);
-            t_success = MCDeployCapsuleDefineString(t_capsule, kMCCapsuleSectionTypeLibrary, (MCStringRef)t_val);
-        }
-    
+
 	// Now add the externals, if any
 	if (t_success)
 		for(uindex_t i = 0; i < MCArrayGetCount(p_params.externals) && t_success; i++)
