Skip to content

Commit 44dfc73

Browse files
committed
Add support for both 32-bit and 64-bit externals
The `architecture` key is now supported for externals. Example: ``` externals: windows: - filename: blur-x86.dll name: blur architecture: 32 - filename: blur-x64.dll name: blur architecture: 64 ```
1 parent 93bfba5 commit 44dfc73

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

framework/levure.livecodescript

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2247,7 +2247,7 @@ private command resolveHelperFolderAssets pBuildProfile, @xHelperA, pExternalPac
22472247
put xHelperA into tConfigA
22482248

22492249
if tError is empty then
2250-
local tPlatform, tTargetPlatform
2250+
local tPlatform, tTargetPlatform, tArchitecture
22512251

22522252
# stack files
22532253
repeat with j = 1 to the number of elements of tConfigA["ui"]
@@ -2256,6 +2256,11 @@ private command resolveHelperFolderAssets pBuildProfile, @xHelperA, pExternalPac
22562256
end repeat
22572257

22582258
put targetPlatform() into tTargetPlatform
2259+
if the processor is "x86" then
2260+
put 32 into tArchitecture
2261+
else
2262+
put 64 into tArchitecture
2263+
end if
22592264

22602265
set the wholematches to true
22612266

@@ -2270,6 +2275,7 @@ private command resolveHelperFolderAssets pBuildProfile, @xHelperA, pExternalPac
22702275
end if
22712276

22722277
if tPlatform is tTargetPlatform and tConfigA["externals"][tTargetPlatform][j]["name"] is not empty \
2278+
and (xHelperA["architecture"] is empty or xHelperA["architecture"] is tArchitecture) \
22732279
and tConfigA["externals"][tTargetPlatform][j]["name"] is not among the lines of pExternalPackagesInMemory then
22742280
put tConfigA["externals"][tTargetPlatform][j]["filename"] into \
22752281
line (the number of lines of sAppA["externals to load"] + 1) of sAppA["externals to load"]

0 commit comments

Comments
 (0)