Commit Graph

83 Commits

Author SHA1 Message Date
Esteban Papp d58bda5bbf WIP
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-08 13:43:30 -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
Esteban Papp b28349be73 Fixes for Android
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-03 15:36:48 -07:00
Esteban Papp 6773af91bc fixes windows warnings
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-09-03 11:11:28 -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
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 553cf52c86 some install fixes, now I dont see the INSTALL target on projects using the prebuilt-SDK
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-31 18:03:06 -07:00
Artur K 96a5f06ca3 Legacy cleanup, part 2 (#3659)
* Legacy cleanup, part 2

There are still things that can be removed, those will be likely done in part three:
`The Return of the Cleanup` :)

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix windows build

Somehow there were some unfixed errors from enabled warnings?
I'm unsure if I've pulled repo in unstable state, or those were somehow
missed.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
2021-08-30 14:40:02 -06:00
Esteban Papp 6b96be82ea Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Legacy/CrySystem/Log.cpp
#	Code/Tools/Standalone/Source/Driller/Annotations/AnnotationHeaderView.cpp
#	Code/Tools/Standalone/Source/Driller/AreaChart.cpp
#	Code/Tools/Standalone/Source/Driller/AreaChart.hxx
#	Code/Tools/Standalone/Source/Driller/ChannelDataView.cpp
#	Code/Tools/Standalone/Source/Driller/DrillerCaptureWindow.cpp
#	Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataView.cpp
2021-08-25 11:47:19 -07:00
Esteban Papp f94043dc83 Adds functions so targets can define install directories/files 2021-08-24 15:12:02 -07:00
Esteban Papp b609d5e2cb supporting multiple directories
automatically excluding obvious things
cleanup and verification

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-23 19:41:57 -07:00
Esteban Papp cf6c7c4d8d some unused fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-19 18:26:43 -07:00
Esteban Papp a1b59e5e5e install reorg/cleanup
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-19 08:51:29 -07:00
pappeste 63f36dfe70 LauncherUnified
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 16:05:23 -07:00
Esteban Papp 8f05c7aa2f Several build fixes 2021-08-12 16:42:18 -07:00
Esteban Papp 37ffe90353 Merge branch 'development' into cmake/SPEC-7182
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/QtUtil.h
#	Code/Legacy/CryCommon/Linux_Win32Wrapper.h
#	Code/Legacy/CryCommon/ProjectDefines.h
#	Code/Legacy/CryCommon/StringUtils.h
#	Code/Legacy/CryCommon/UnicodeBinding.h
#	Code/Legacy/CryCommon/UnicodeEncoding.h
#	Code/Legacy/CryCommon/UnicodeFunctions.h
#	Code/Legacy/CryCommon/UnicodeIterator.h
#	Code/Legacy/CryCommon/WinBase.cpp
#	Code/Legacy/CryCommon/platform.h
#	Code/Legacy/CryCommon/platform_impl.cpp
#	Gems/LyShine/Code/Source/Animation/UiAnimationSystem.cpp
#	Gems/Maestro/Code/Source/Cinematics/Movie.cpp
2021-08-11 11:16:24 -07:00
Esteban Papp fa2032d21d Linux fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-10 19:02:38 -07:00
pappeste 9c72510a4f removing files that got added by rebase
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> (+1 squashed commits)

Squashed commits:

[a19269426] fixing more strings

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> (+1 squashed commits)

Squashed commits:

[d2a049324] fixing more strings

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> (+1 squashed commits)

Squashed commits:

[a1ff4c101] trying to build

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-28 09:54:42 -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 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
Chris Galvan 3b1873b045 Merged stabilization/2106 -> development (resolved merge conflicts).
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-08 13:56:47 -05:00
mgwynn 82d2fb9244 Adding header to resolve undefined type error (#1938)
Signed-off-by: mgwynn <mgwynn@amazon.com>
2021-07-08 09:26:56 -07:00
nvsickle b328cdf11d Make the launcher's lack of DPI awareness on Windows explicit
This will enable per-screen DPI awareness to be turned on later

Signed-off-by: nvsickle <nvsickle@amazon.com>
2021-07-07 11:51:10 -07:00
Chris Galvan d7574777a8 Resolved merge conflicts
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-02 12:42:44 -05:00
Steve Pham b4a2edec6a Final update copyright headers to reference license files at the repo root (#1693)
* Final update copyright headers to reference license files at the repo root

Signed-off-by: spham <spham@amazon.com>

* Fix copyright validator unit tests to support the stale O3DE header scenario

Signed-off-by: spham <spham@amazon.com>
2021-06-30 19:51:55 -07:00
Gene Walters 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 2021-06-28 19:09:20 -07:00
SJ 9dc961ec35 [iOS] Fix incorrect window size being used when rendering on newer iPhones with bigger screens. (#1625)
* [iOS] Fix incorrect window size being used when rendering on newer iPhones with bigger screens.

Signed-off-by: amzn-sj <srikkant@amazon.com>
2021-06-28 17:53:43 -07:00
amzn-mgwynn ce955715a8 Merge pull request #1543 from aws-lumberyard-dev/native-ui-changes
More specific component error messaging and modes for native UI to prevent blocking dialog in some applications
2021-06-25 19:18:03 -04:00
mgwynn c5dca9e232 removed a call used for testing with different flags active 2021-06-25 15:41:31 -04:00
mgwynn 692c993bdb Incorporating review comments. Adding nativeUI setting for launchers. 2021-06-25 15:34:32 -04:00
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
Esteban Papp 9720984c61 SPEC-7437 Launcher_Windows.cpp failing to compile 2021-06-21 15:39:13 -07:00
nvsickle e55580af57 Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18 2021-06-18 13:25:53 -07:00
Esteban Papp 2fa6883455 SPEC-6663 add file(READ files to tracking (#1416)
* adding property to track files read by file(READ

* code review comments

* adding newline
2021-06-17 16:16:10 -07:00
Olex Lozitskiy 1eaa11303b sig/network - added r_viewportPos cvar for set the position of a viewport (Windows only)
Example: +r_viewportPos 100 200
Works from a command line or --console-command-file
2021-06-16 11:59:55 -04:00
AMZN-Olex a446d397c6 Minor name refactoring 2021-06-15 14:05:35 -04:00
AMZN-Olex 2f5cffe679 Added r_ViewportPos cvar for set the position of a viewport of a game/server launchers 2021-06-15 13:46:53 -04:00
amzn-sj a86062bd91 Skip interface libraries when genrating StaticModules for game server as well 2021-06-11 16:42:09 -07:00
amzn-sj 469b1a0858 Fix monolithic link error involving gem variants which are "aliased" as interface libraries with multiple gem target dependencies 2021-06-11 16:30:46 -07:00
amzn-sj ac5196dbf5 Revert previous change 2021-06-11 15:19:28 -07:00
amzn-sj 21f209311c Parameter may be unused 2021-06-11 14:54:24 -07:00
lumberyard-employee-dm a9e59fd75f Updating the DefaultProject template to not insert the project-path parameter (#1223)
* Updating the DefaultProject template to not insert the project-path parameter into the VS Debugger Arguments for any applications

Added project-path injection directly within the LauncherUnified and AssetBuilder cmake scripts where their targets are defined

* Removing the add_vs_debugger_arguments call from the AutomatedTesting CMakeLists.txt
2021-06-09 18:50:47 -05:00
Esteban Papp 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
karlberg 14bc0ba8ac Merge remote-tracking branch 'origin' into MultiplayerComponents 2021-06-02 14:57:00 -07:00
Esteban Papp ff9a052ce6 Merge pull request #1011 from aws-lumberyard-dev/ly-as-sdk/LYN-2948
Integration of the LY as an SDK work
2021-05-28 11:30:13 -07:00
moudgils 2b35ed1d7f Fixes to get monolithic builds working for ios 2021-05-28 08:50:27 -07:00
karlberg e737307168 Merging latest origin/main 2021-05-27 20:00:54 -07:00
karlberg 802943bbb3 Bug fixes, naming changes to make variables more clear, and adds a cvar to adjust client window size 2021-05-27 19:54:56 -07:00
pappeste 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
lumberyard-employee-dm 9a0b93c9ff Fixed generation of Monolithic builds StaticModules.inl (#947)
* Fixed generation of Monolithic builds StaticModules.inl
A project's gem module RUNTIME_DEPENDENCIES were not visited to
determine any dependent gem modules that needed to load.
Therefore the CreateStaticModules function were missing
CreateModuleClass_* function calls required initialize the gem's AZ::Module
derived class in monolithic builds

* Removed the logic to strip the Gem:: and Project:: prefix from the Server Launcher gem dependencies

When associating gem dependencies with the server target there was CMake logic left over in it to strip the beginning of the target name if it began with "Gem::" or "Project::"
2021-05-26 12:18:26 -05:00