Merge branch 'main' into ly-sdk/phistere/LaunchApFromSDK

2021-04-21 14:54:53 -05:00
parent 70b4938cff 626f7c00fe
commit d1067edd3a
82 changed files with 13087 additions and 615 deletions
@@ -9,13 +9,11 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #

-set(sdkwrapper_dir ${CMAKE_CURRENT_LIST_DIR}/../SDKWrapper)
-
 if (NOT PAL_TRAIT_BUILD_HOST_TOOLS)
    return()
 endif()

-ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME})
+set(sdkwrapper_dir ${CMAKE_CURRENT_LIST_DIR}/../SDKWrapper)

 ly_add_target(
    NAME FbxSDKWrapper STATIC