Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit baaead1

Browse files
livecodepanoslivecodepanos
committed
[[ Bug 22940 ]] Remove support for 32bit on MacOS IDE and standalone
This patch removes support for running the IDE in 32bit mode, as well as for building 32bit standalones on MacOS.
1 parent 45db9bf commit baaead1

File tree

6 files changed

+21
-17
lines changed

6 files changed

+21
-17
lines changed

‎Installer/package.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ installer LiveCode
6666
// set TargetArchitecture to armv6-hf
6767
// include Runtime
6868
// include Externals
69-
with TargetFolder as "[[ToolsFolder]]/Runtime/Mac OS X/x86-32" do
69+
with TargetFolder as "[[ToolsFolder]]/Runtime/Mac OS X/x86-64" do
7070
set TargetPlatform to MacOSX
71-
set TargetArchitectures to i386
71+
set TargetArchitectures to x86_64
7272
include Runtime
7373
include Externals
7474
if TargetPlatform is MacOSX then

‎config.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ def host_platform(opts):
276276
def guess_xcode_arch(target_sdk):
277277
sdk, ver = re.match('^([^\d]*)(\d*)', target_sdk).groups()
278278
if sdk == 'macosx':
279-
return 'i386 x86_64'
279+
return 'x86_64'
280280
if sdk == 'iphoneos':
281281
if int(ver) < 8:
282282
return 'armv7'

‎config/mac.gypi‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
{
198198
'xcode_settings':
199199
{
200-
'ARCHS': 'i386 x86_64',
200+
'ARCHS': 'x86_64',
201201
'ONLY_ACTIVE_ARCH': 'YES',
202202
'GCC_OPTIMIZATION_LEVEL': '0',
203203
},
@@ -207,7 +207,7 @@
207207
{
208208
'xcode_settings':
209209
{
210-
'ARCHS': 'i386 x86_64',
210+
'ARCHS': 'x86_64',
211211
'GCC_OPTIMIZATION_LEVEL': '3',
212212
'GCC_ENABLE_FIX_AND_CONTINUE': 'NO',
213213
},
@@ -217,7 +217,7 @@
217217
{
218218
'xcode_settings':
219219
{
220-
'ARCHS': 'i386 x86_64',
220+
'ARCHS': 'x86_64',
221221
'GCC_OPTIMIZATION_LEVEL': '0',
222222
'GCC_ENABLE_FIX_AND_CONTINUE': 'NO',
223223
},

‎docs/notes/bugfix-22940.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Remove support for 32bit on MacOS IDE and standalones

‎ide-support/revsaveasstandalone.livecodescript‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,17 @@ on revSaveAsStandalone pStack, pFolder, pPreview, pSuppressSuccessMsg
160160
-- MM-2014-03-21: [[ PPC Support Dropped ]] Assume all mac builds to now be Intel.
161161
if tSettings["MacOSX"] then
162162
delete variable tSettings["MacOSX"]
163-
put true into tSettings["MacOSX x86-32"]
163+
put true into tSettings["MacOSX x86-64"]
164164
put true into tEdited
165165
end if
166166
if tSettings["MacOSX PowerPC-32"] then
167167
delete variable tSettings["MacOSX PowerPC-32"]
168-
put true into tSettings["MacOSX x86-32"]
168+
put true into tSettings["MacOSX x86-64"]
169+
put true into tEdited
170+
end if
171+
if tSettings["MacOSX x86-32"] then
172+
delete variable tSettings["MacOSX x86-32"]
173+
put true into tSettings["MacOSX x86-64"]
169174
put true into tEdited
170175
end if
171176

@@ -432,11 +437,11 @@ private function revStandalonePlatformDetails pTarget
432437
case "MacOSX"
433438
-- MM-2014-03-21: [[ PPC Support Dropped ]] We now only support intel Mac builds. Assume all mac builds to be intel.
434439
-- MW-2013-06-13: [[ CloneAndRun ]] If not installated type, then take from the binaries folder.
435-
put "Mac OS X/x86-32" into tArchFolder
440+
put "Mac OS X/x86-64" into tArchFolder
436441
put ".bundle" into tDetailsA["loadable_extension"]
437442
put ".dylib" into tDetailsA["shared_extension"]
438443
put "MacOSX" into tDetailsA["platform"]
439-
put "x86-32" into tDetailsA["architecture"]
444+
put "x86-64" into tDetailsA["architecture"]
440445
break
441446
case "Windows"
442447
if pTarget is "Windows" then
@@ -660,9 +665,7 @@ command revSaveAsMacStandalone pStack, pRestoreFileName, pFolder, @xStandalonePa
660665

661666
-- Architectures
662667
local tArchitectures
663-
if sStandaloneSettingsA["MacOSX x86-32"] then put "i386," after tArchitectures
664-
if sStandaloneSettingsA["MacOSX x86-64"] then put "x86-64," after tArchitectures
665-
delete char -1 of tArchitectures
668+
put "x86-64" into tArchitectures
666669

667670
-- keep a copy of the standalone settings to restore after each build
668671
local tStandaloneSettingsA
@@ -1751,7 +1754,7 @@ private command revSetMacOS pWhatFile, pPlatformCode, pEnginePath
17511754

17521755
-- MM-2014-03-21: [[ PPC Support Dropped ]] We no longer include universal builds so set icon prefix to intel standalone.
17531756
local tIconPrefix
1754-
put revEnvironmentRuntimePath() & "/Mac OS X/x86-32/Standalone.app/Contents/Resources/Standalone" into tIconPrefix
1757+
put revEnvironmentRuntimePath() & "/Mac OS X/x86-64/Standalone.app/Contents/Resources/Standalone" into tIconPrefix
17551758

17561759
if sStandaloneSettingsA["OSX,iconFile"] is not empty then
17571760
revSBCopyFile sStandaloneSettingsA["OSX,iconFile"], item 1 to -3 of pWhatFile & "/Resources/Standalone.icns", "revStandaloneProgressCallback", the long id of me
@@ -2164,7 +2167,7 @@ private command revCopyDatabaseDrivers pPlatform, pStackFilePath, pStandalonePat
21642167
if there is not a folder (item 1 to -2 of tStandaloneFolder&"/Frameworks") then create folder (item 1 to -2 of tStandaloneFolder&"/Frameworks")
21652168
revSBCopyFolderToDestination (item 1 to -2 of tStandaloneFolder&"/MacOS/Externals/database_drivers/VXCMD_macho.bundle/Contents/Frameworks/VSDK.framework"),(item 1 to -2 of tStandaloneFolder&"/Frameworks"), "revStandaloneProgressCallback", the long id of me
21662169
if the result is not empty then
2167-
revStandaloneAddWarning ("Mac x86-32, failed to copy Valentina framework")
2170+
revStandaloneAddWarning ("Mac x86-64, failed to copy Valentina framework")
21682171
end if
21692172
end if
21702173
end repeat

‎ide-support/revsblibrary.livecodescript‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1021,7 +1021,7 @@ function revEngineCheck pEngine
10211021
case "MacOSX PowerPC-32"
10221022
case "MacOSX x86-32"
10231023
case "MacOSX x86-64"
1024-
return there is a directory (tPath & "/Mac OS X/x86-32/Standalone.app")
1024+
return there is a directory (tPath & "/Mac OS X/x86-64/Standalone.app")
10251025
case "Windows"
10261026
if there is a file (tPath & "/Windows/x86-32/Standalone") then
10271027
return true
@@ -3050,7 +3050,7 @@ function revSBEnginePath pPlatform
30503050
// SN-2015-07-09: [[ StandaloneDeployment ]] Gypified Standalone-<edition>.app building does not
30513051
// allow to create broken applications, so that the executable file in it bears the edition.
30523052
put the upper of char 1 of tEdition into char 1 of tEdition
3053-
return tRuntimePath & "/Mac OS X/x86-32/Standalone.app/Contents/MacOS/Standalone-" & tEdition
3053+
return tRuntimePath & "/Mac OS X/x86-64/Standalone.app/Contents/MacOS/Standalone-" & tEdition
30543054
break
30553055
case "Windows"
30563056
return tRuntimePath & "/Windows/x86-32/Standalone"

0 commit comments

Comments
 (0)