Commit Graph

606 Commits

Author SHA1 Message Date
Esteban Papp 99a009bb77 WIP checkpoint
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-17 12:36:09 -07:00
Esteban Papp 9cba144e39 forgot destination
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-15 11:44:45 -07:00
Esteban Papp c2864e2ec0 used a CMake 3.21 function, but that is not the min version we support
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-15 09:49:28 -07:00
Esteban Papp bdf9005c53 PR comments
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-14 18:19:42 -07:00
Esteban Papp 36b7cb2814 Merge branch 'development' into cmake/warn_virtual
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzCore/AzCore/Memory/HeapSchema.h
#	Code/Framework/AzCore/AzCore/Memory/HphaSchema.h
#	Code/Framework/AzCore/AzCore/Memory/MallocSchema.h
#	Code/Framework/AzCore/AzCore/Memory/OverrunDetectionAllocator.h
2021-09-14 15:32:35 -07:00
Esteban Papp 2c066a81da Adds support for creating an SDK layout from a Monolithic build (#4097)
Adds support for creating an SDK layout from a Monolithic build and have the same install prefix used between monolithic and non-monolithic

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-14 15:11:11 -07:00
Esteban Papp e356003fb5 Fixes for VS < 17 and Android
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-14 14:10:17 -07:00
lumberyard-employee-dm a91ea7d549 Removed unused EngineJson.cmake file (#4107)
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-09-14 13:04:52 -05:00
Esteban Papp ee2e728760 Merge branch 'development' into cmake/warn_virtual
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-14 10:28:58 -07:00
Nicholas Lawson 6103c9c63c Updates libtiff for all platforms (#4068)
The new libtiff is uniform, and static, across all platforms.
It includes zlib support and uses our own zlib.

Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>
2021-09-13 12:35:29 -07:00
Esteban Papp de3d2a2b69 Detects that binary dir and install prefix are not the same (#4091)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-13 11:15:23 -07:00
Scott Romero 32e6473de2 [development] Update RapidXML package info (#4057)
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-09-13 10:41:53 -07:00
rgba16f [Amazon] 4c1c2d6f6b update freetype library revision used (#4065)
* Update freetype linux package revision

* Update mac & ios revisions of the freetype library

* Update Mac freetype to use rev 16

* update linux to use freetype rev 16

* Update Android & Mac to use freetype rev 16

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
2021-09-13 11:19:20 -05:00
Esteban Papp 5815b48a00 disabling the warning after merge
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-10 21:16:03 -07:00
Esteban Papp 5965760612 Merge branch 'development' into cmake/warn_virtual
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-10 20:27:01 -07:00
Esteban Papp 8554cea0ad better organization of the warning
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-10 20:14:58 -07:00
Esteban Papp 5909e471e6 Limits configuration types a project sees when using an engine SDK (#4033)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-10 10:39:42 -07:00
Esteban Papp ba331b29f7 Creates destination directory if it doesnt exists file(ARCHIVE_CREATE will fail if the directory is not there
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-10 08:39:45 -07:00
Chris Burel 0445ec3956 Remove references to unsupported "xlib" windowing system support (#4028)
Support for X clients is provided by xcb instead.

Signed-off-by: Chris Burel <burelc@amazon.com>
2021-09-09 16:13:23 -07:00
Esteban Papp 7f7d3d9c1c Creates destination directory if it doesnt exists, file(ARCHIVE_CREATE will fail if the directory is not there
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-09 16:09:55 -07:00
Esteban Papp 9f6d4125b8 Merge branch 'development' into cmake/warn_virtual
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-09 11:50:40 -07:00
Nicholas Lawson 30cafff04d new LZ4 package to fix debug compile issue (#3993)
* Updates lz4 to rev3 of packages which fixes debug builds

Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>
2021-09-08 13:37:37 -07:00
Vincent Liu 81966cbcbf [LYN-5564] Update AWSNativeSDK revision (#3686)
Signed-off-by: onecent1101 <liug@amazon.com>
2021-09-08 12:57:13 -07:00
Esteban Papp 860b28c10b more fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-08 08:48:32 -07:00
Esteban Papp c805d443d2 Merge branch 'development' into cmake/warn_virtual
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Legacy/CryCommon/IConsole.h
#	Code/Legacy/CrySystem/LocalizedStringManager.h
#	Code/Legacy/CrySystem/XConsole.h
#	Code/Legacy/CrySystem/XConsoleVariable.h
#	Code/Legacy/CrySystem/XML/XmlUtils.cpp
#	cmake/Platform/Common/Clang/Configurations_clang.cmake
2021-09-07 18:42:40 -07:00
Esteban Papp 9e0ff8e55d disabling external headers for analyzer
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-07 18:36:40 -07:00
Esteban Papp d814662810 Fixes renderdoc define
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-07 16:15:22 -07:00
Esteban Papp 6b13e8bfc8 Enabling PreFast to find virtual/override issues, some better organization of files
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-07 16:11:48 -07:00
Esteban Papp 46c6923bf7 Enabling warnings around format security
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-07 15:17:40 -07:00
Junbo Liang 8edcc504bd Add AWSI automation tests to a new test suite and pipe (#3913)
Signed-off-by: junbo <junbo@amazon.com>
2021-09-07 13:02:13 -07:00
Esteban Papp 1d4487f4f8 Improvement suggestion from another PR
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-07 11:53:40 -07:00
Esteban Papp aad2c214a4 Merge branch 'development' into cmake/warn_virtual
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-07 08:26:37 -07:00
Esteban Papp 8c51fc24f7 Adding clang warning
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-07 07:54:35 -07:00
Esteban Papp a63954d6cf simplifying how PIX is passed
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-03 18:26:59 -07:00
Esteban Papp e215dd4423 prevents 3rdParty that are not in the source tree from being installed
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-03 18:23:11 -07:00
Esteban Papp e9dfa3f8dd Enabling warnings in MSVC
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-03 14:49:32 -07:00
Esteban Papp 925bcee0db Create Deploy Script that can copy a Project Game Release Layout to a standalone location
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-03 13:28:22 -07:00
Esteban Papp e8495cf829 adds equivalent warnign for windows
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-03 11:11:04 -07:00
Esteban Papp 522e4bff9e Merge branch 'development' into cmake/warn_format_security
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	cmake/Platform/Common/Clang/Configurations_clang.cmake
2021-09-03 11:10:40 -07:00
rgba16f [Amazon] 64a561a948 update revision of lz4 package used by o3de (#3911)
* Update windows & android builtin lz4 package version

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Update linux builtin packages to use the new lz4 vcpkg

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Update Mac & iOS builtins to use the new lz4 vcpkg

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Update MultiplayerCompression Gem LZ4Compressor to use the replacement for deprecated LZ4compressHC function

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
2021-09-03 10:19:45 -07:00
Esteban Papp bfdcf74ea0 PR comments/suggestions
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-03 09:10:47 -07:00
Esteban Papp 1aa7059d01 generates paks for release
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-02 18:24:49 -07:00
Esteban Papp 9a6a1ba97a fixes monolithic release
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-02 18:24:25 -07:00
Esteban Papp dc4424b131 Merge branch 'development' into issues/3202
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzCore/AzCore/RTTI/BehaviorContext.h
2021-09-02 14:23:47 -07:00
SJ daf901e809 Set target_file variable since it's still being used in Mac runtime dependencies cmake file (#3905)
Signed-off-by: amzn-sj <srikkant@amazon.com>
2021-09-02 14:16:13 -07:00
Esteban Papp 188f54fee0 Fixes Ninja non-multi config generator and potentially other non-multi config generators (#3867)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-02 08:56:29 -07:00
Esteban Papp 26d277cc14 Merge branch 'development' into issues/3202
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-01 15:19:32 -07:00
Nicholas Lawson 043a2c65ff Updates zlib to rev2 of the package, static only (#3725)
The previous version of the package was dynamic on some platforms,
and static on others.  This makes it static across the board and
also makes it compatible with other 3p libraries wanting to use
zlib.

Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>
2021-09-01 09:04:20 -07:00
lumberyard-employee-dm 0ad2fe2294 Set enable gem variants feature (#3631)
* Implemented the RFC to allow projects to need to specify the Gems

Projects no longer need to specify CMake Targets to associate a Gem
variant with.

In order to associate a CMake Target with a gem variant a new
`ly_set_gem_variant_to_load` function has been added that maps CMake
Targets -> Gem Variants.

This allows CMake Targets to self describe which gem variants they
desire to build and load

This implementation is backwards compatible:
The `ly_enable_gems` function still accepts the TARGETS and VARIANTS
arguments which it will forward to the new `ly_set_gem_variant_to_load`
function to allow the input Targets to be associated with input Gem
Variants

This changes fixes the issue with gems that are required by an
Application regardless of the Project in use, not replicating it's
"requiredness" to the SDK layout

Fixes #3430

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

* Added an LY_PROJECT_NAME property to the Launcher targets

The `ly_enable_gems_delayed` now command queries the LY_PROJECT_NAME property
associated with each target to determine if the gems being enabled are
match the project the target is associated with.
In this case the target only adds dependencies if the gems is being enabled
without a specific project or if the gems is being enabled for the
matching project.

If the LY_PROJECT_NAME property is not set for target, it indicates the
gems for each project can be added as dependencies to the target.

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

* The INSTALL step now forwards the LY_PROJECT_NAME property for a target

The Install_common.cmake has been updated to support configuring
TARGET_PROPERTIES into the generated CMakeLists.txt for install targets.

Furthermore the indentation of the generated CMakeLists.txt has been
normalized to help with readability

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

* Updating the Atom_Bootstrap CMakeLists.txt to enable the Atom_Bootstrap Gem


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

* Added a deprecation message to ly_enable_gems when supplying TARGETS and
VARIANTS

Added a define_property call for the LY_PROJECT_NAME target property
Removed the .Builders alias for the PrefabBuilder and renamed the
GEM_MODULE target o PrefabBuilder.Builders.

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

* Removed superflous space from AutomatedTesting Gem CMakeLists.txt

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-09-01 11:01:50 -05:00
Esteban Papp 404d6864fd proper set of CMAKE_INSTALL_PREFIX
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-01 08:44:46 -07:00