birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into cpack_installer

Browse Source
This commit is contained in:
scottr
2021-05-26 20:20:47 -07:00
parent 883ddf667e 13de9de3c1
commit 86035104b9
296 changed files with 2882 additions and 1386 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/Platform/Android/PAL_android.cmake
+1 -1
View File
@@ -35,7 +35,7 @@ else()
endif()
# Set the default asset type for deployment
set(LY_ASSET_DEPLOY_ASSET_TYPE "es3" CACHE STRING "Set the asset type for deployment.")
set(LY_ASSET_DEPLOY_ASSET_TYPE "android" CACHE STRING "Set the asset type for deployment.")
# Set the python cmd tool
if(PAL_HOST_PLATFORM_NAME_LOWERCASE STREQUAL "windows")
cmake/Platform/Mac/PAL_mac.cmake
+1 -1
View File
@@ -35,7 +35,7 @@ else()
endif()
# Set the default asset type for deployment
set(LY_ASSET_DEPLOY_ASSET_TYPE "osx_gl" CACHE STRING "Set the asset type for deployment.")
set(LY_ASSET_DEPLOY_ASSET_TYPE "mac" CACHE STRING "Set the asset type for deployment.")
# Set the python cmd tool
ly_set(LY_PYTHON_CMD ${CMAKE_CURRENT_SOURCE_DIR}/python/python.sh)