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

Merge branch 'cpack/jenkins-main' of https://github.com/aws-lumberyard-dev/o3de into cpack/jenkins-main

Browse Source
This commit is contained in:
scottr
2021-06-20 20:21:48 -07:00
parent 00bb33587a 26017c1b49
commit 64a960e428
126 changed files with 28192 additions and 12788 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/Platform/Common/Clang/Configurations_clang.cmake
+2
View File
@@ -55,6 +55,8 @@ ly_append_configurations_options(
-g # debug symbols
COMPILATION_RELEASE
-O2
LINK_NON_STATIC
-Wl,-undefined,error
)
include(cmake/Platform/Common/TargetIncludeSystemDirectories_supported.cmake)
cmake/Platform/Linux/Configurations_linux.cmake
-2
View File
@@ -21,8 +21,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
COMPILATION
-fPIC
-msse4.1
LINK_NON_STATIC
-Wl,--no-undefined
)
ly_set(CMAKE_CXX_EXTENSIONS OFF)
else()
cmake/Platform/Mac/Configurations_mac.cmake
-1
View File
@@ -20,7 +20,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
__APPLE__
DARWIN
LINK_NON_STATIC
-Wl,-undefined,error
-headerpad_max_install_names
-lpthread
-lncurses
cmake/Platform/Windows/Packaging/Shortcuts.wxs
+13 -3
View File
@@ -7,7 +7,7 @@
<DirectoryRef Id="TARGETDIR">
<Directory Id="ProgramMenuFolder">
<Directory Id="ApplicationProgramsFolder" Name="$(var.CPACK_PACKAGE_NAME)">
<Directory Id="ApplicationProgramsFolder" Name="$(var.CPACK_PACKAGE_NAME) [Developer Preview]">
<Directory Id="VersionedApplicationProgramsFolder" Name="$(var.CPACK_PACKAGE_VERSION)"/>
</Directory>
</Directory>
@@ -46,10 +46,20 @@
<DirectoryRef Id="VersionedApplicationProgramsFolder">
<Component Id="StartMenuShortcuts" Guid="{E6447F0F-A46E-4A72-83D8-600707B590E8}">
<Shortcut Id="StartMenuShortcut_Launcher"
<Shortcut Id="StartMenuShortcut_Editor"
Target="[root.bin.Windows.profile]Editor.exe"
WorkingDirectory="root.bin.Windows.profile"
Name="$(var.CPACK_PACKAGE_NAME) Editor" />
<Shortcut Id="StartMenuShortcut_MaterialEditor"
Target="[root.bin.Windows.profile]MaterialEditor.exe"
WorkingDirectory="root.bin.Windows.profile"
Name="$(var.CPACK_PACKAGE_NAME) Material Editor" />
<Shortcut Id="StartMenuShortcut_ProjectManager"
Target="[root.bin.Windows.profile]o3de.exe"
WorkingDirectory="root.bin.Windows.profile"
Name="$(var.CPACK_PACKAGE_NAME)" />
Name="$(var.CPACK_PACKAGE_NAME) Project Manager" />
<RemoveFolder Id="RemoveVersionedApplicationProgramsFolder" Directory='VersionedApplicationProgramsFolder' On="uninstall"/>
<RemoveFolder Id="RemoveApplicationProgramsFolder" Directory="ApplicationProgramsFolder" On="uninstall"/>