Commit Graph

464 Commits

Author SHA1 Message Date
Esteban Papp f0cafd0e9d Create RUN target as helpers for the project-centric workflow (#2520)
* Create RUN target as helpers for the project-centric workflow

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

* typo fix

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

* rename target as "<target>.Imported" and create "<target>" as the metatarget that is used for debugging and building in o3de

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-28 15:53:14 -07:00
Esteban Papp 0040c7fd9b Tweak test projects so the console window remains open (#2380)
* tweak test projects so the console window remains open

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

* doing it for all test projects

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

* newline at the end of the file to make devs happy

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-28 14:48:06 -07:00
Esteban Papp 433aec4f34 Disabling this since the fast checkup in VS doesnt solve what this was hoping to solve, we need to emit and add as dependencies all the includes involved in autogen (#2383)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-28 09:25:31 -07:00
amzn-phist 7b7adb8573 Don't require a specific version of Wwise SDK, allow for later versions to be used (#2484)
* Updates the Wwise SDK detection in CMake

Parses AkWwiseSDKVersion.h to obtain the version instead of requiring an
exact version to be installed.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Updates readme.md information about Wwise

Rewrite some of the setup info about Wwise, mention the two ways in
which Wwise can be found via CMake and that users can install later
versions than the one specified.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Remove unnecessary parts of Wwise version detect

Don't need to parse the file contents, it was only being used to print a
message to CMake.  Simplify the validation to just checking that the SDK
version header exists.  Maybe in the future we can reinstate better
version checking to make sure the version falls within a range.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Updates capitalization of Audiokinetic name

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
2021-07-27 18:18:03 -05:00
Esteban Papp a20588952e disable vcpkg for every project (#2507)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-27 15:41:17 -07:00
Esteban Papp da474357f3 Some var cleanup so it shows better-organized in cmake-gui. Some vars… (#2361)
* Some var cleanup so it shows better-organized in cmake-gui. Some vars were also not following the namign convention we are using
Removed some unnecessary messaging
Fixed a TIF bug where it would report the wrong test in a message, fixed a message that was being triggered
Changed TIF to be enabled just by the binary so running the ci_build scripts locally doesnt trigger TIF messaging
Removed `LY_ENABLE_MULTIPLAYER_COMPRESSION`, it was not being used

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

* handling case where a parameter can be empty

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

* needs to be var name, not contents

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-26 14:14:56 -07:00
Steve Pham e81f59d1e1 Create XCB Connection mechanism for WSISurface implementation for Linux (#2400)
- Add new Linux Trait to determine which display driver client API to use (only xcb supported for now)
- Add support for xcb connections (initial) for Linux/Vulkan
- Fix minor assertion caused by wrong use of sizeof
- Fix casing issue in a couple of material files (Linux is case sensitive)
2021-07-26 13:41:28 -07:00
Royal OBrien a12defcb30 Merge pull request #2364 from AMZN-scspaldi/scspaldi_LyTTTestsforLinux
Made LyTT Tests check if they are disabled for the platform.
2021-07-26 13:35:30 -04:00
Esteban Papp 70c9ed93f8 Make locations for LY_PACKAGE_DOWNLOAD_CACHE_LOCATION and LY_PACKAGE_UNPACK_LOCATION relative to LY_3RDPARTY_PATH across configurations (#2360)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-22 16:42:51 -07:00
scspaldi 2de3a5e6d7 Made LyTT Tests check if they are disabled for the platform.
Signed-off-by: scspaldi <scspaldi@amazon.com>
2021-07-22 12:59:19 -07:00
Esteban Papp a007f1a462 Issues/2126 PhysX Gem can't be used as build dependency in engine SDK Part (#2337) (#2340)
* Applying GENEX_EVAL to 2 cases where the genex can produce another genex

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

* Missing case when the folder is an external one to the engine/project (e.g. external gems)

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-22 11:20:58 -07:00
Steve Pham 4d5a985276 Enable AZSLc and Shader Compilation on Linux (#2338)
* Enable Shader Compilation support for Linux
* Add azslc package 3P definition for download
* Add AzslcGeader.azsli nad PlatformHeader.hlsli for Linux/Null and Linux/Vulkan (Copy of Android/Vulkan)
* Enable trait PAL_TRAIT_BUILD_ATOM_ASSET_SHADER_SUPPORTED for Linux
* Add platform builder file dependencies
* Updated AZ_TRAIT_ATOM_SHADERBUILDER_AZSLC to use new 3P linux version of azslc
* Add AtomShaderCapabilities.json, PlatformLimits.azasset for Linux (Copy from Android)
* Fix paths/values for Vulkan_Traits_Linux.h
* Enable trait PAL_TRAIT_BUILD_ATOM_ASSET_SHADER_SUPPORTED for Linux
* Enabled AZ_TRAIT_ATOM_VULKAN_LAYER_LUNARG_STD_VALIDATION_SUPPORT for Linux/Vulkan
* Added AzslcHeader.azsli, PlatformHeader.hlsli dependencies for Linux/Null and Linux/Vulkan in the platform builders for windows and mac for consistency

Signed-off-by: spham-amzn <spham@amazon.com>
2021-07-22 10:16:17 -07:00
L4stR1t3s cf2effc58c Ninja compile and link pool CMake settings (#2334)
* Ninja compile and link pool CMake settings

Signed-off-by: L4stR1t3s <69721170+L4stR1t3s@users.noreply.github.com>

* Added CMake cached variables for Ninja compile/link pool settings

Signed-off-by: L4stR1t3s <69721170+L4stR1t3s@users.noreply.github.com>
2021-07-21 16:04:01 -07:00
lumberyard-employee-dm c6054cd03a Merge pull request #2307 from aws-lumberyard-dev/fix_cmake_python_local
Fixed cmake Python so it correctly reinstalls a local python package if its setup.py changes
2021-07-20 18:00:39 -05:00
Garcia Ruiz 54cfd26b6c Fixed cmake Python so it correctly reinstalls a local python package if its setup.py changes
Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>
2021-07-20 23:16:09 +02:00
Esteban Papp 00f50f2a90 Re-enable using non-officially-supported generators when building with MSVC
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-07-20 09:00:08 -07:00
Axel Nana c333c453c6 Add missing *.hxx pattern
Signed-off-by: Axel Nana <axel.nana@aliens-group.com>
2021-07-20 01:05:09 +01:00
Chris Burel ebfaf269f6 Remove special compiler flags for unsupported VS2017 compiler
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-07-19 13:30:33 -07:00
Chris Burel da02d47069 Re-enable using non-officially-supported generators when building with MSVC
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-07-19 13:30:31 -07:00
Terry Michaels d9ec159f0e Merge pull request #2235 from aws-lumberyard-dev/daimini/gitflow_210716_o3de
Gitflow 7/16/21 - O3DE
2021-07-16 17:50:44 -05:00
Steve Pham 38261d0800 Shorten copyright headers by splitting into 2 lines (#2213)
* Updated all copyright headers to split the longer original copyright line into 2 shorter lines

Signed-off-by: Steve Pham <spham@amazon.com>
2021-07-16 15:25:48 -07:00
Steve Pham 18611a95eb Update qt package hash for Linux
Update to pull in fixed Linux QT Package to resolve missing runtime dependencies
Signed-off-by: spham-amzn <spham@amazon.com>
2021-07-16 15:07:11 -07:00
Danilo Aimini bf8897551f Merge branch 'development' of https://github.com/o3de/o3de into daimini/gitflow_210716_o3de 2021-07-16 13:22:03 -07:00
Danilo Aimini e9270e491a Merge branch 'stabilization/2106' into daimini/gitflow_210716_o3de
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

# Conflicts:
#	scripts/build/bootstrap/incremental_build_util.py
2021-07-16 13:21:55 -07:00
Steve Pham 6909968ffb Add SPIRVCross for Linux
Signed-off-by: spham-amzn <spham@amazon.com>
2021-07-16 13:18:31 -07:00
lumberyard-employee-dm 67c37762a3 Fixed iteration of the gem_assets_paths variable in the (#2222)
Install_common.cmake to make sure the the Gem assets are copied to the
install layout

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-07-16 11:22:21 -05:00
hultonha 2c9922d4b5 Merge remote-tracking branch 'upstream/development' into hultonha_LY-69118_lambda_crash 2021-07-15 09:28:47 +01:00
SJ 7eeaf7dad5 Generate install layout for Mac (#2144)
* 1. Move call to install(TARGETS...) to its own function to create a platform specific implementation for Mac.
2. Add linker-signed flag to work around cmake install issue.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Add newline

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Rename function to ly_install_target_override and only call it if it has been implemented.
2. Pass in runtime, archive, and library directory paths as params to clean it up a bit.

Signed-off-by: amzn-sj <srikkant@amazon.com>
2021-07-14 17:32:07 -07:00
lumberyard-employee-dm fcef9333a7 Fixed creation of paths in the install layout for external source paths (#2152)
* Fixed creation of paths in the install layout for external source paths

Any source path that is not within the engine root is now copied to an
External directory within the engine root

Updated the gem copy regex to include the preview.png file and Editor/Scripts directory

Added an ly_add_install_paths function for installing a list of paths to
the install layout

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Moved the ly_get_last_path_segment_concat_sha256 and
ly_get_engine_relative_source_dir functions to cmake/FileUtil.cmake

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-07-14 13:16:06 -05:00
hultonha 9939913c8d update MSVC to use new lambda processing
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-07-13 18:23:19 +01:00
lumberyard-employee-dm 158e25bd23 ly_create_alias() now adds the directory it was called from to the (#2120)
LY_ALL_TARGET_DIRECTORIES property if that directory has not already
been added

This addresses an issue where if a CMakeLists.txt contains a call to
ly_create_alias(), but NOT a call to ly_add_target, it would not be
added to the generated CMakeLists.txt for the install layout

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-07-12 20:22:32 -05:00
Scott Romero b7723ad0ea [stabilization/2106] Auto generate installer 3rd party license URL from version string (#2111)
3rd party license URL is now auto generated from the version string (which should be synchronized with the GitHub release tags) and pulled directly from the source repo it originated from, but only when the version is non-zero.  This also fixes an issue where configure would fail when the previous 3rd party URL wasn't supplied
Fixed an issue where CrashHandler required version strings to be 4 components

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
2021-07-12 15:34:11 -07:00
Esteban Papp afe661cacd Add support for VS2022 (#2065)
* Add generation code for VS, cleanup

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

* Remove unused code and fixed comments of what is supported

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

* Code review comments

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-12 13:39:30 -07:00
AMZN-ScottR 585caabd95 [installer/2106-3p-license-fix] replaced 3rd party license url arg with auto generated one from version string
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-07-12 11:38:05 -07:00
Esteban Papp f83439e6c4 Add Vcpkg settings to map configs to what vcpkg expects (this prevents a message from being issue when vcpkg is installed) (#2063)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-12 10:24:45 -07:00
Esteban Papp a8435ec982 Issues/2045 3rdParty runtime dependencies copied multiple times (#2058)
* 3rdParty runtime dependencies copied multiple times

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

* 3rdParty to update timestamps when uncompressing to provoke copy of runtime dependencies

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

* typo fix

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-12 10:23:48 -07:00
Chris Galvan e924ed0b86 Merged stabilization/2106 to development; Resolved merge conflicts
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-12 10:45:23 -05:00
Scott Romero 61d5d5afa2 [stabilization/2106] upload a copy of the bootstrap installer to the 'latest' folder for tagged builds (#2046)
A build tag file with the commit info is included in the 'latest' upload
Silenced output of upload script

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
2021-07-09 17:55:15 -07:00
Scott Romero a67ec5cb5e [stabilization/2106] update desktop shortcuts created by the installer (#2037)
Changed the existing desktop shortcut for Project Manager to include tool name and dropped version number for consistent branding
Added desktop shortcut for the Editor

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
2021-07-09 17:28:18 -07:00
AMZN-ScottR 9b72b71aa0 [installer/2106-latest-upload] also upload a copy of the boostrapper to the 'latest' folder for tagged builds
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-07-09 14:58:32 -07:00
Esteban Papp 4f628cfb77 Fix for alias not understood in generation expressions that query properties (#2034)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-09 14:25:23 -07:00
AMZN-ScottR 3e7f99812a [installer/2106-desktop-shortcuts] update desktop shortcuts created by the installer
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-07-09 11:57:51 -07:00
Steve Pham 4826f1b653 Fix RPATH issues for qt/plugin binaries (#2018)
- Add special handling for shared objects copied from qt/plugins to correct the RPATH to reflect destination folder

Signed-off-by: spham-amzn <spham@amazon.com>
2021-07-09 10:34:34 -07:00
lumberyard-employee-dm e06ec2caa9 Fixed cmake configuring when using an External Gem (#2020)
The ly_get_absolute_pal_filename method has been refactored to no longer
use regular expressions to determine how to split a PAL directory, but
instead Path operations are used

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-07-09 12:19:42 -05:00
lumberyard-employee-dm 097dc25424 Fixed the discovery of the dependencies of gem variant aliases which (#2013)
alias INTERFACE LIBRARY targets.

This was causing the dependent Atom_AtomBridge sub gems from not being
found when generating the cmake_dependencies.*.setreg file containing
the list of gem modules to load

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-07-09 00:41:25 -05:00
Esteban Papp d7c8c0192f SPEC-7503 Mac nightly run asset profile failed to process "Translation/scriptcanvas_en_us.ts" (#1742)
* copy frameworks to output for loose file case

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

* patching lrelease

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

* Fix for python in loose files and bundles

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

* found what the problem is, setting a version just in case

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

* fixup_bundle working with Python.framework and codesigning on AssetProcessor.app

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

* Trying to ignore other files to solve Jenkins

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

* Fix some qt stuff for mac

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

* removal of cstemp files to prevent signature failures

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

* Updating Qt with fixes to solve some qt framework issues with include paths

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-08 17:20:20 -07:00
Jeongseok Lee ec026963b8 Create 3rd-party directory if not exists (#1877)
Signed-off-by: Jeongseok Lee <jeoslee@amazon.com>
2021-07-07 18:18:48 -07:00
hultonha 2ea9bfb144 merge stabilization/2106 into development
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-07-06 17:34:04 +01:00
John 17fde4e228 Move source of truth logic from TIAF to job 2021-07-05 14:56:48 +01:00
amzn-hdoke 1dfe65a3ef Update AWSNativeSDK-Android revision and enable AWS gems (#1837)
Signed-off-by: dhrudesh <dhrudesh@amazon.com>
2021-07-04 15:47:17 -07:00