Skip to content

Mac_IL2CPP component installer #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Josh Wittner (jwittner) merged 10 commits into from
Apr 11, 2019
Merged

Mac_IL2CPP component installer #161

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d22ec0c
Mac_IL2CPP component installer
StephenHodgson Apr 1, 2019
b0980aa
reverted some line moves
StephenHodgson Apr 1, 2019
18a36f9
reverted whitespace change
StephenHodgson Apr 1, 2019
ec50edf
revert formatting change
StephenHodgson Apr 2, 2019
b69eaa3
Removed Mac common platform test
StephenHodgson Apr 2, 2019
2cfada1
reverted mac component line
StephenHodgson Apr 2, 2019
6c78888
Revert Linux move
StephenHodgson Apr 2, 2019
9f9dfbf
Update UnitySetup/UnitySetup.psm1
StephenHodgson Apr 4, 2019
2394ed8
Enabled component
StephenHodgson Apr 4, 2019
e428577
Merge branch 'develop' into dev-macil2cpp
jwittner Apr 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion UnitySetup/UnitySetup.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ enum UnitySetupComponent {
Facebook = (1 -shl 11)
Vuforia = (1 -shl 12)
WebGL = (1 -shl 13)
All = (1 -shl 14) - 1
Mac_IL2CPP = (1 -shl 14)
All = (1 -shl 15) - 1
}

[Flags()]
Expand Down Expand Up @@ -94,6 +95,7 @@ class UnitySetupInstance {
@{
[UnitySetupComponent]::Documentation = , [io.path]::Combine("$Path", "Documentation");
[UnitySetupComponent]::StandardAssets = , [io.path]::Combine("$Path", "Standard Assets");
[UnitySetupComponent]::Mac_IL2CPP = , [io.path]::Combine("$playbackEnginePath", "MacStandaloneSupport/Variations/macosx64_development_il2cpp");
[UnitySetupComponent]::Windows = , [io.path]::Combine("$playbackEnginePath", "WindowsStandaloneSupport");
[UnitySetupComponent]::Linux = , [io.path]::Combine("$playbackEnginePath", "LinuxStandaloneSupport");
}
Expand Down Expand Up @@ -319,6 +321,7 @@ function Find-UnitySetupInstaller {
[UnitySetupComponent]::Linux = , "$targetSupport/UnitySetup-Linux-Support-for-Editor-$Version.$installerExtension";
[UnitySetupComponent]::Mac = "$targetSupport/UnitySetup-Mac-Support-for-Editor-$Version.$installerExtension",
"$targetSupport/UnitySetup-Mac-Mono-Support-for-Editor-$Version.$installerExtension";
[UnitySetupComponent]::Mac_IL2CPP = , "$targetSupport/UnitySetup-Mac-IL2CPP-Support-for-Editor-$Version.$installerExtension";
[UnitySetupComponent]::Vuforia = , "$targetSupport/UnitySetup-Vuforia-AR-Support-for-Editor-$Version.$installerExtension";
[UnitySetupComponent]::WebGL = , "$targetSupport/UnitySetup-WebGL-Support-for-Editor-$Version.$installerExtension";
[UnitySetupComponent]::Windows_IL2CPP = , "$targetSupport/UnitySetup-Windows-IL2CPP-Support-for-Editor-$Version.$installerExtension";
Expand Down