Commit Graph

26 Commits

Author SHA1 Message Date
spham aaf2200122 Merge branch 'main' into platform/SPEC-6061 2021-04-16 17:58:49 -07:00
amzn-sj b38449ffaa Merge branch 'main' into LYN-2893 2021-04-16 16:21:36 -07:00
amzn-sj 73f275f479 Get FindOpenGLInterface to use ly_add_external_target() instead 2021-04-16 15:37:26 -07:00
alexpete 10faddb113 Integrating github/staging through commit ef88e6e 2021-04-16 12:05:11 -07:00
amzn-sj f76322d13d Remove Android/iOS pal files since OpenGL is only needed by host tools. 2021-04-15 15:59:30 -07:00
amzn-sj 7902eafd7d Add empty pal files for platforms other than Mac 2021-04-15 15:20:55 -07:00
spham dbae71c511 Fixes for android nightly unit tests
- Fix broken test launcher caused by change in unit test module registry format
- Fix test runner script's ENGINE_ROOT (re-parenting) path caused by move of file to different folder
- Adding step to always perform an android sdk update to latest creating and launching android virtual device (AVD)
2021-04-15 11:57:23 -07:00
amzn-sj a81ca4490f Move EMotionFX's OpenGL dependency to 3rd Party and make sure Mac builds successfully 2021-04-15 10:42:34 -07:00
lumberyard-employee-dm 8019312b35 Merge pull request #28 from aws-lumberyard-dev/LYN-2883
Updating the FOLDER filtering in the LyTestWrappers.cmake custom targets to remove leading '..' from the VS folder filter
2021-04-14 20:55:27 -05:00
mcgarrah d29fe24396 Merge remote-tracking branch 'upstream/main' into LYN-2883 2021-04-14 17:43:20 -05:00
amzn-sj fff97cda3b Cache runtime dependencies for targets to speed up iOS configuration. 2021-04-14 13:09:21 -07:00
Chris Burel 9c01e993db Convert etc2comp to new 3p system (#44) 2021-04-14 12:58:03 -07:00
Esteban Papp 042241a119 SPEC-6268 Remove check for 3rdParty.txt 2021-04-14 12:26:20 -07:00
Esteban Papp 70c2d5ee40 SPEC-5789 Remove inclusion of CMakeParseArguments 2021-04-14 10:24:23 -07:00
alexpete 8469c9ca0a Integrating github/staging through commit 5f214be 2021-04-13 17:18:57 -07:00
mcgarrah 51928f779f Merge branch 'main' into LYN-2883 2021-04-13 18:52:59 -05:00
alexpete 60e6f204d2 Cherrypicking AWS fixes from f57af843
This fix brings in a new 3rdparty revision for AWS that fixes a minor dependency issue on Android
2021-04-13 09:19:07 -07:00
mcgarrah ea7b8309b5 Updating the FOLDER filtering in the LyTestWrappers.cmake custom targets to remove leading '..' from the VS folder filter 2021-04-13 00:43:33 -05:00
alexpete c5b955d281 Integrating github/staging through commit b0dd7ed 2021-04-09 12:03:26 -07:00
alexpete 1044dc3da1 Integrating github/staging through commit ab87ed9 2021-04-09 11:27:37 -07:00
alexpete c2cbd430fe Integrating up through commit 90f050496 2021-04-07 14:03:29 -07:00
Brian Herrera 39f53338bf Merge branch 'main' into LoadPipelineFromGitHub 2021-03-26 17:05:57 -07:00
alexpete 36c4e827bd Integrating latest from github/staging
Integrating up through commit 5e1bdae
2021-03-26 14:32:02 -07:00
Brian Herrera e8bbb5a0d5 Set scripts to be executable
This is required to build on linux/mac
2021-03-26 09:26:12 -07:00
alexpete 75dc720198 Integrating latest 47acbe8 2021-03-25 13:57:57 -07:00
alexpete a10351f38d Initial commit 2021-03-08 14:30:57 -08:00