Fixes to get monolithic builds working for ios

main
moudgils 5 years ago
parent af8e257c15
commit 2b35ed1d7f

@ -179,6 +179,7 @@ function(ly_delayed_generate_static_modules_inl)
${launcher_unified_binary_dir}/${project_name}.GameLauncher/Includes/StaticModules.inl ${launcher_unified_binary_dir}/${project_name}.GameLauncher/Includes/StaticModules.inl
) )
ly_target_link_libraries(${project_name}.GameLauncher PRIVATE ${all_game_gem_dependencies})
if(PAL_TRAIT_BUILD_SERVER_SUPPORTED) if(PAL_TRAIT_BUILD_SERVER_SUPPORTED)
get_property(server_gem_dependencies GLOBAL PROPERTY LY_STATIC_MODULE_PROJECTS_DEPENDENCIES_${project_name}.ServerLauncher) get_property(server_gem_dependencies GLOBAL PROPERTY LY_STATIC_MODULE_PROJECTS_DEPENDENCIES_${project_name}.ServerLauncher)
@ -204,6 +205,7 @@ function(ly_delayed_generate_static_modules_inl)
${launcher_unified_binary_dir}/${project_name}.ServerLauncher/Includes/StaticModules.inl ${launcher_unified_binary_dir}/${project_name}.ServerLauncher/Includes/StaticModules.inl
) )
ly_target_link_libraries(${project_name}.ServerLauncher PRIVATE ${all_server_gem_dependencies})
endif() endif()
endforeach() endforeach()
endif() endif()

@ -10,7 +10,7 @@
# #
ly_add_target( ly_add_target(
NAME AtomViewportDisplayInfo GEM_MODULE NAME AtomViewportDisplayInfo ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
NAMESPACE Gem NAMESPACE Gem
FILES_CMAKE FILES_CMAKE
atomviewportdisplayinfo_files.cmake atomviewportdisplayinfo_files.cmake

@ -149,7 +149,7 @@ def get_bootstrap_values(bootstrap_dir, keys_to_extract):
raise logging.error(f'Bootstrap.setreg file {bootstrap_file} does not exist.') raise logging.error(f'Bootstrap.setreg file {bootstrap_file} does not exist.')
result_map = {} result_map = {}
with bootstrap_file.open('r') as f: with open(bootstrap_file, 'r') as f:
try: try:
json_data = json.load(f) json_data = json.load(f)
except Exception as e: except Exception as e:
@ -157,9 +157,9 @@ def get_bootstrap_values(bootstrap_dir, keys_to_extract):
else: else:
for search_key in keys_to_extract: for search_key in keys_to_extract:
try: try:
search_result = json_data["Amazon"]["AzCore"]["Bootstrap"][f'"{search_key}"'] search_result = json_data["Amazon"]["AzCore"]["Bootstrap"][search_key]
except KeyError as e: except KeyError as e:
logging.error(f'Bootstrap.setreg cannot find Amazon:AzCore:Bootstrap:{search_result}: {str(e)}') logging.warning(f'Bootstrap.setreg cannot find /Amazon/AzCore/Bootstrap/{search_key}: {str(e)}')
else: else:
result_map[search_key] = search_result result_map[search_key] = search_result

@ -107,7 +107,7 @@ def verify_layout(layout_dir, platform_name, project_path, asset_mode, asset_typ
project_name_lower = project_path.lower() project_name_lower = project_path.lower()
layout_path = pathlib.Path(layout_dir) layout_path = pathlib.Path(layout_dir)
bootstrap_path = layout_path / 'Registry' bootstrap_path = pathlib.Path(ROOT_ENGINE_PATH) / 'Registry'
bootstrap_values = common.get_bootstrap_values(str(bootstrap_path), [f'{platform_name_lower}_remote_filesystem', bootstrap_values = common.get_bootstrap_values(str(bootstrap_path), [f'{platform_name_lower}_remote_filesystem',
f'{platform_name_lower}_connect_to_remote', f'{platform_name_lower}_connect_to_remote',
f'{platform_name_lower}_wait_for_connect', f'{platform_name_lower}_wait_for_connect',

Loading…
Cancel
Save