birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' into o3de_sdk/installer_configs

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialSystemComponent.cpp
#	cmake/Platform/Common/Install_common.cmake
This commit is contained in:
Esteban Papp
2021-10-25 12:47:36 -07:00
parent 595e0e1a83 4d4deb1211
commit fec1b2fda2
1023 changed files with 33913 additions and 13107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/Platform/Windows/Packaging/Shortcuts.wxs
+4 -4
View File
@@ -29,13 +29,13 @@
<Component Id="DesktopShortcuts" Guid="{2600B54A-65FB-4507-A7CD-3CE4817C7173}">
<Shortcut Id="DesktopShortcut_Editor"
Target="[root.bin.Windows.profile]Editor.exe"
WorkingDirectory="root.bin.Windows.profile"
Target="[root.bin.Windows.profile.Default]Editor.exe"
WorkingDirectory="root.bin.Windows.profile.Default"
Name="$(var.CPACK_PACKAGE_NAME) Editor" />
<Shortcut Id="DesktopShortcut_ProjectManager"
Target="[root.bin.Windows.profile]o3de.exe"
WorkingDirectory="root.bin.Windows.profile"
Target="[root.bin.Windows.profile.Default]o3de.exe"
WorkingDirectory="root.bin.Windows.profile.Default"
Name="$(var.CPACK_PACKAGE_NAME) Project Manager" />
<RemoveFolder Id="DesktopFolder" On="uninstall"/>