From ac961c33c61b487d982ca9cf9b04ba4ac754ecda Mon Sep 17 00:00:00 2001 From: Bryan Galdrikian Date: Fri, 26 Jan 2018 21:55:41 -0800 Subject: Apex dependency removed (used in ExtImport) Mesh corruption and crash fit for UV fitting function Updated release_notes.txt --- tools/compiler/cmake/ApexImporter.cmake | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'tools/compiler') diff --git a/tools/compiler/cmake/ApexImporter.cmake b/tools/compiler/cmake/ApexImporter.cmake index cc5c463..f8e4a45 100644 --- a/tools/compiler/cmake/ApexImporter.cmake +++ b/tools/compiler/cmake/ApexImporter.cmake @@ -5,8 +5,9 @@ SET(APEXIMPORTER_SOURCE_DIR ${PROJECT_SOURCE_DIR}/ApexImporter/src) SET(TOOLS_COMMON_DIR ${BLAST_ROOT_DIR}/tools/common) SET(TOOLS_COMMON_DIR ${BLAST_ROOT_DIR}/tools/common) +SET(APEX_MODULES_DIR ${BLAST_ROOT_DIR}/sdk/extensions/import/apexmodules) + FIND_PACKAGE(PhysXSDK $ENV{PM_PhysX_VERSION} REQUIRED) -FIND_PACKAGE(ApexSDK $ENV{PM_Apex_VERSION} REQUIRED) FIND_PACKAGE(PxSharedSDK $ENV{PM_PxShared_VERSION} REQUIRED) FIND_PACKAGE(tclap $ENV{PM_tclap_VERSION} REQUIRED) FIND_PACKAGE(FBXSDK $ENV{PM_FBXSDK_VERSION} REQUIRED) @@ -47,10 +48,13 @@ TARGET_INCLUDE_DIRECTORIES(ApexImporter PRIVATE ${TOOLS_COMMON_DIR} PRIVATE ${PHYSXSDK_INCLUDE_DIRS} - PRIVATE ${APEXSDK_INCLUDE_DIRS} PRIVATE ${PXSHAREDSDK_INCLUDE_DIRS} PRIVATE ${TCLAP_INCLUDE_DIRS} PRIVATE ${FBXSDK_INCLUDE_DIRS} + + PRIVATE ${APEX_MODULES_DIR}/nvparutils + + PRIVATE ${APEX_MODULES_DIR}/NvParameterized/include ) TARGET_COMPILE_DEFINITIONS(ApexImporter @@ -72,6 +76,6 @@ TARGET_LINK_LIBRARIES(ApexImporter ADD_CUSTOM_COMMAND(TARGET ApexImporter POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${APEXSDK_DLLS} ${PHYSXSDK_DLLS} ${PXSHAREDSDK_DLLS} + ${PHYSXSDK_DLLS} ${PXSHAREDSDK_DLLS} ${BL_EXE_OUTPUT_DIR} ) -- cgit v1.2.3