diff options
| author | Bryan Galdrikian <[email protected]> | 2018-01-26 21:55:41 -0800 |
|---|---|---|
| committer | Bryan Galdrikian <[email protected]> | 2018-01-26 21:55:41 -0800 |
| commit | ac961c33c61b487d982ca9cf9b04ba4ac754ecda (patch) | |
| tree | 2600d61bb009f065384d548eb16fdc2d12f0f227 /tools/compiler | |
| parent | Updated release notes (diff) | |
| download | blast-ac961c33c61b487d982ca9cf9b04ba4ac754ecda.tar.xz blast-ac961c33c61b487d982ca9cf9b04ba4ac754ecda.zip | |
Apex dependency removed (used in ExtImport)
Mesh corruption and crash fit for UV fitting function
Updated release_notes.txt
Diffstat (limited to 'tools/compiler')
| -rw-r--r-- | tools/compiler/cmake/ApexImporter.cmake | 10 |
1 files changed, 7 insertions, 3 deletions
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} ) |