kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into 8.3.0-Dev

Browse Source
This commit is contained in:
Josh Tynjala
2025-01-29 09:37:47 -08:00
parent fa101f90b8 5fd2b560c4
commit 2da06fa2af
11 changed files with 52 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/platforms/IOSPlatform.hx
View File

@@ -354,7 +354,7 @@ class IOSPlatform extends PlatformTarget
}
context.IOS_LINKER_FLAGS = ["-stdlib=libc++"].concat(project.config.getArrayString("ios.linker-flags"));
context.IOS_NON_EXEMPT_ENCRYPTION = project.config.getBool("ios.non-exempt-encryption", true);
context.IOS_NON_EXEMPT_ENCRYPTION = project.config.getBool("ios.non-exempt-encryption", false);
switch (project.window.orientation)
{

2
tools/platforms/MacPlatform.hx
View File

@@ -711,7 +711,7 @@ class MacPlatform extends PlatformTarget
continue;
}
}
if (Lambda.exists(homebrewDirs, dirPath -> StringTools.startsWith(resolvedLibPath, dirPath)))
if (Lambda.exists(homebrewDirs, function(dirPath:String):Bool { return StringTools.startsWith(resolvedLibPath, dirPath); }))
{
homebrewDependencyPaths.push(libPath);
pathsToSearchForHomebrewDependencies.push(resolvedLibPath);

4
tools/platforms/WindowsPlatform.hx
View File

@@ -383,7 +383,7 @@ class WindowsPlatform extends PlatformTarget
var visualStudioPath = StringTools.trim(vswhereOutput);
var vcvarsallPath = visualStudioPath + "\\VC\\Auxiliary\\Build\\vcvarsall.bat";
// this command sets up the environment variables and things that visual studio requires
var vcvarsallCommand = [vcvarsallPath, "x64"].map(arg -> ~/([&|\(\)<>\^ ])/g.replace(arg, "^$1"));
var vcvarsallCommand = [vcvarsallPath, "x64"].map(function(arg:String):String { return ~/([&|\(\)<>\^ ])/g.replace(arg, "^$1"); });
// this command runs the cl.exe c compiler from visual studio
var clCommand = ["cl.exe", "/Ox", "/Fe:" + executablePath, "-I", Path.combine(targetDirectory, "obj"), Path.combine(targetDirectory, "obj/ApplicationMain.c")];
for (file in System.readDirectory(applicationDirectory))
@@ -398,7 +398,7 @@ class WindowsPlatform extends PlatformTarget
}
clCommand.push("/link");
clCommand.push("/subsystem:windows");
clCommand = clCommand.map(arg -> ~/([&|\(\)<>\^ ])/g.replace(arg, "^$1"));
clCommand = clCommand.map(function(arg:String):String { return ~/([&|\(\)<>\^ ])/g.replace(arg, "^$1"); });
// combine both commands into one
command = ["cmd.exe", "/s", "/c", vcvarsallCommand.join(" ") + " && " + clCommand.join(" ")];
}

10
tools/utils/PlatformSetup.hx
View File

@@ -816,11 +816,6 @@ class PlatformSetup
setupHaxelib(new Haxelib("lime"));
}
if (System.hostPlatform == MAC)
{
ConfigHelper.writeConfigValue("MAC_USE_CURRENT_SDK", "1");
}
if (targetFlags.exists("noalias"))
{
return;
@@ -1079,11 +1074,6 @@ class PlatformSetup
setupHaxelib(new Haxelib("openfl"));
}
if (System.hostPlatform == MAC)
{
ConfigHelper.writeConfigValue("MAC_USE_CURRENT_SDK", "1");
}
if (targetFlags.exists("noalias"))
{
return;