9ca0e731f4
Merge remote-tracking branch 'upstream/stabilization/2106' into mnaumov/StabilizationJun15
...
# Conflicts:
# Code/CryEngine/CrySystem/LevelSystem/LevelSystem.cpp
2021-06-15 10:41:13 -07:00
4af5faa0a9
[stabilization/2106] bootstrap installer theme support ( #1294 )
2021-06-14 09:54:00 -07:00
633de3d28b
[cpack/stabilization/2106] bootstrap installer theme support (required for changes requested by legal)
2021-06-11 17:58:14 -07:00
6d15a0d6e9
Merge branch 'stabilization/2106' into FixLinuxBenchmarks
2021-06-11 16:50:03 -07:00
d7ec767ebc
Enable -Wnon-pod-varargs ( #1278 )
2021-06-11 15:43:09 -07:00
2d41a701af
Merge branch 'stabilization/2106' into tomhh_stabilization-to-development
2021-06-11 09:43:11 +01:00
bbae6490d9
Enabled LyTestTools trait only for windows and mac
2021-06-10 14:38:14 -07:00
39d207095a
Remove call to ly_get_absolute_pal_filename that's not needed
2021-06-09 15:31:33 -07:00
d6d2cbae7e
Merge branch 'stabilization/2106' into gitflow_210609
2021-06-09 14:26:29 -07:00
47205d088f
SPEC-2513 Fixes to enable w4310
2021-06-09 13:05:45 -07:00
68ffdd6714
SPEC-2513 Fixes to enable w4324 ( #1197 )
...
* Fix warning 4324
* warning that doesnt trigger anything
* missed warning
2021-06-09 11:33:13 -07:00
4b3d0d1054
LYN-4327 [SDK] External Gem's aren't added to the project solution when using SDK ( #1191 )
...
* should pickup the external directories registered by the project
* Add support for AzTest and AzTestRunner in the SDK
* missing IMPORT_LIB
* Moved where .Assets targets get generated so they are visible in the SDK
* generate the Directory.Build.props in the right path
* excluding target on platforms that dont support it
2021-06-08 14:01:50 -07:00
57faa2d377
[cpack_installer] installer upload to s3
2021-06-07 15:15:14 -07:00
74e5090f26
Adding ExternalWarningLevel to the Directory.Build.props to get the default warning level for external headers to match the one we define through compile options ( #1160 )
2021-06-04 18:08:52 -07:00
d9b57bce67
Fixed configuring of cmake when a project resides on a different drive than the engine ( #1153 )
2021-06-04 19:34:22 -05:00
08db058476
SPEC-2513 Fixes to enable w4436 and w4366 ( #1157 )
...
* Fix for w4457
* Nothing to fix, seems we deleted all the code that was causing this offense
* removing warning
* another warning that doesnt trigger
2021-06-04 16:41:24 -07:00
cf35585bc0
Making incremental linking off by default ( #1154 )
2021-06-04 15:25:57 -07:00
e71a4656bc
SPEC-2513 Fixes to enable w4450 ( #1145 )
...
* Fix for w4457
* Nothing to fix, seems we deleted all the code that was causing this offense
2021-06-04 15:10:20 -07:00
76a6df341b
SPEC-2513 Fixes to enable w4457
2021-06-04 10:51:47 -07:00
0d1b217b24
Merge branch 'main' into cpack_installer
2021-06-04 06:45:43 -07:00
dce87534c7
Removing the Pyside implementation of the project manager python scripts ( #1112 )
...
* Removing the Pyside implementation of the project manager python scripts
* Removing reference to the scripts/project_manager directory
The Install_common.cmake script reference to the project_manager directory has been removed.
2021-06-03 14:37:16 -05:00
5d7aae9bd8
SPEC-2513 Fixes to enable w4459 ( #1107 )
...
* fixing w4459
* Fixes for nounity
* putting OLD_APARAM_USER in a common place to avoid duplicated declarations
2021-06-03 11:12:54 -07:00
957937ffc2
Merge branch 'main' into cpack_installer
2021-06-03 10:54:46 -07:00
29c71b4e53
SPEC-2513 Fixes to enable w4701 ( #1105 )
...
* Some fixes
* more fixes
* fixes for debug
2021-06-03 09:30:33 -07:00
8214706ff9
[cpack_installer] reworked how packaging is enabled for windows
2021-06-03 08:24:01 -07:00
328ced0059
[cpack_installer] replaced missing get_target_property hack and fixed a typo
2021-06-03 07:24:30 -07:00
b09f73378f
[cpack_installer] replaced LY_DEFAULT_INSTALL_COMPONENT with built-in CMAKE_INSTALL_DEFAULT_COMPONENT_NAME. updated stale references to ly_install_target_COMPONENT with a get_prop call
2021-06-02 20:49:39 -07:00
3a7ec61efd
Merge branch 'main' into cpack_installer
2021-06-02 17:02:44 -07:00
f1dbeb584a
LYN-4206 CMake bakes install prefix during configure ( #1100 )
2021-06-02 16:50:18 -07:00
12cdaed03e
[cpack_installer] updated installer icon/logo
2021-06-02 13:58:37 -07:00
cfd06f2e4a
[cpack_installer] added check for desired cmake version to be at least greater than minimum required plus minor cleanup
2021-06-02 13:10:11 -07:00
7d1fedc10c
LYN-4128 EditorPythonBindings.Editor in debug does not load (missing python_d.dll)
2021-06-01 08:29:35 -07:00
8b9f5230f6
Merge branch 'main' into ly-as-sdk/LYN-2948
2021-05-28 00:16:26 -07:00
c67cd2dc4e
Renaming the TargetCMakeLists.txt.in to InstalledTarget.in to get avoid it being picked up by the CopyrightValidator
2021-05-27 17:35:08 -05:00
f6568f5c63
Re-added back an ly_setup_target function which configures the CMakeLists.txt template for a single target
2021-05-27 13:10:54 -07:00
18e479589d
Updating the Install_common.cmake ly_setup_o3de_install() function to be
...
able forward all the ly_add_targets calls within a single source Engine
CMakeLists.txt to a single installed Engine CMakeLists.txt
2021-05-27 12:19:49 -07:00
cba5c35de5
Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948
2021-05-27 10:30:28 -07:00
f1b688f435
Merge branch 'main' into ly-as-sdk/LYN-2948
...
# Conflicts:
# CMakeLists.txt
# Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h
# Gems/AtomLyIntegration/AtomViewportDisplayInfo/gem.json
# cmake/LYWrappers.cmake
# cmake/SettingsRegistry.cmake
# scripts/o3de/tests/unit_test_current_project.py
2021-05-27 10:29:19 -07:00
5b8e759c2d
Implemented changes in the ly_setup_target() command to forward the ly_create_alias() command calls to the configured CMakeLists.txt per installed target
2021-05-26 23:59:49 -05:00
86035104b9
Merge branch 'main' into cpack_installer
2021-05-26 20:20:47 -07:00
883ddf667e
[cpack_installer] removed static cmake package in favor of using file(DOWNLOAD ...)
2021-05-26 20:19:42 -07:00
84cf3bffde
Updating the Install_common.cmake script to copy over the source engine.json templates array to the generated installed engine.json
2021-05-26 20:49:52 -05:00
9b1be43367
Renamed osx_gl to mac and es3 to android for cache folders ( #949 )
2021-05-26 19:17:17 -05:00
2ba645c264
[cpack_installer] post install hooks to install cmake and python
2021-05-26 16:13:14 -07:00
76fe7f3666
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into ly-as-sdk/LYN-2948-phistere
2021-05-25 23:48:55 -05:00
d536a9438d
Revert "Fixes an issue with RUNTIME_DEPENDENCIES including too many targets during install"
...
This reverts commit f972edee01
2021-05-25 17:36:16 -05:00
b99bcea24a
Updating the engine.json.in template for the cmake INSTALL target to add the list of external subdirectories to allow the installed layout to access the subdirectories via it's engine.json file
2021-05-24 00:43:21 -05:00
d83d9c9bff
[cpack_installer] fixed issue with applying default installer GUIDs when seed property changes
2021-05-19 20:26:27 -07:00
e0cb0fec9b
[cpack_installer] add desktop and start menu shortcuts
2021-05-19 19:39:52 -07:00
3d4d63ab1d
[cpack_installer] installer product icons
2021-05-19 14:08:38 -07:00
mnaumov
Scott Romero
srikappa-amzn
Chris Burel
hultonha
amzn-sj
daimini
Esteban Papp
lumberyard-employee-dm
pappeste
Terry Michaels