Skip to content

Added lumin component installers #148

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
merged 9 commits into from
Apr 29, 2019
Merged

Added lumin component installers #148

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
17f4123
added lumin component installers
StephenHodgson Jan 9, 2019
2e1f8f3
Merge branch 'develop' into dev-lumin-component-installer
StephenHodgson Apr 1, 2019
0d34c4e
moved lumin playback engine into common section
StephenHodgson Apr 1, 2019
b6b5738
Merge branch 'develop' into dev-lumin-component-installer
StephenHodgson Apr 17, 2019
54d8633
merged dev branch
StephenHodgson Apr 17, 2019
9d350e3
added lumin back to the parameter list for build platform
StephenHodgson Apr 19, 2019
780fd29
fixed spacing
StephenHodgson Apr 19, 2019
db1e904
Merge branch 'develop' into dev-lumin-component-installer
StephenHodgson Apr 19, 2019
09f593f
Merge branch 'develop' into dev-lumin-component-installer
StephenHodgson Apr 26, 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 @@ -20,6 +20,7 @@ enum UnitySetupComponent {
Vuforia = (1 -shl 12)
WebGL = (1 -shl 13)
Mac_IL2CPP = (1 -shl 14)
Lumin = (1 -shl 15)
All = (1 -shl 15) - 1
}

Expand Down Expand Up @@ -90,6 +91,7 @@ class UnitySetupInstance {
}

# Common playback engines:
$componentTests[[UnitySetupComponent]::Lumin] = , [io.path]::Combine("$playbackEnginePath", "LuminSupport");
$componentTests[[UnitySetupComponent]::Android] = , [io.path]::Combine("$playbackEnginePath", "AndroidPlayer");
$componentTests[[UnitySetupComponent]::iOS] = , [io.path]::Combine("$playbackEnginePath", "iOSSupport");
$componentTests[[UnitySetupComponent]::AppleTV] = , [io.path]::Combine("$playbackEnginePath", "AppleTVSupport");
Expand Down Expand Up @@ -313,6 +315,7 @@ function Find-UnitySetupInstaller {
[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";
[UnitySetupComponent]::Lumin = , "$targetSupport/UnitySetup-Lumin-Support-for-Editor-$Version.$installerExtension";
}

switch ($currentOS) {
Expand Down Expand Up @@ -1369,7 +1372,7 @@ function Start-UnityEditor {
[parameter(Mandatory = $false)]
[string]$LogFile,
[parameter(Mandatory = $false)]
[ValidateSet('StandaloneOSX', 'StandaloneWindows', 'iOS', 'Android', 'StandaloneLinux', 'StandaloneWindows64', 'WebGL', 'WSAPlayer', 'StandaloneLinux64', 'StandaloneLinuxUniversal', 'Tizen', 'PSP2', 'PS4', 'XBoxOne', 'N3DS', 'WiiU', 'tvOS', 'Switch')]
[ValidateSet('StandaloneOSX', 'StandaloneWindows', 'iOS', 'Android', 'StandaloneLinux', 'StandaloneWindows64', 'WebGL', 'WSAPlayer', 'StandaloneLinux64', 'StandaloneLinuxUniversal', 'Tizen', 'PSP2', 'PS4', 'XBoxOne', 'N3DS', 'WiiU', 'tvOS', 'Switch', 'Lumin')]
[string]$BuildTarget,
[parameter(Mandatory = $false)]
[switch]$AcceptAPIUpdate,
Expand Down