diff options
| author | Anton Novoselov <[email protected]> | 2017-08-14 16:41:28 +0300 |
|---|---|---|
| committer | Anton Novoselov <[email protected]> | 2017-08-14 16:41:28 +0300 |
| commit | 9a1c1d814f3fa0b54b49d90b43130c02bc280f44 (patch) | |
| tree | eae6ead883173c66619c30b6a1ed085f3cb70f4d /tools/compiler | |
| parent | Updated to CL 22627414: (diff) | |
| download | blast-9a1c1d814f3fa0b54b49d90b43130c02bc280f44.tar.xz blast-9a1c1d814f3fa0b54b49d90b43130c02bc280f44.zip | |
Updated to CL 22661993:
* docs updates
* authoring fixes
* asset view in sample fix
* latest blast_tools_and_samples-windows.zip
Diffstat (limited to 'tools/compiler')
| -rw-r--r-- | tools/compiler/cmake/ApexImporter.cmake | 2 | ||||
| -rw-r--r-- | tools/compiler/cmake/Windows/ApexImporter.cmake | 2 | ||||
| -rw-r--r-- | tools/compiler/cmake/Windows/AuthoringTool.cmake | 2 | ||||
| -rw-r--r-- | tools/compiler/cmake/Windows/LegacyConverter.cmake | 2 |
4 files changed, 1 insertions, 7 deletions
diff --git a/tools/compiler/cmake/ApexImporter.cmake b/tools/compiler/cmake/ApexImporter.cmake index c33d8e6..cc5c463 100644 --- a/tools/compiler/cmake/ApexImporter.cmake +++ b/tools/compiler/cmake/ApexImporter.cmake @@ -66,7 +66,7 @@ SET_TARGET_PROPERTIES(ApexImporter PROPERTIES # Do final direct sets after the target has been defined TARGET_LINK_LIBRARIES(ApexImporter - PRIVATE NvBlast NvBlastExtPhysX NvBlastExtAuthoring NvBlastExtImport NvBlastExtExporter NvBlastExtSerialization NvBlastExtTkSerialization NvBlastExtPxSerialization Rpcrt4 $<$<OR:$<CONFIG:debug>,$<CONFIG:checked>,$<CONFIG:profile>>:${NVTOOLSEXT_LIB}> + PRIVATE NvBlast NvBlastExtPhysX NvBlastExtAuthoring NvBlastExtImport NvBlastExtExporter NvBlastExtSerialization NvBlastExtTkSerialization NvBlastExtPxSerialization Rpcrt4 PRIVATE ${FBXSDK_LIBRARIES} ) diff --git a/tools/compiler/cmake/Windows/ApexImporter.cmake b/tools/compiler/cmake/Windows/ApexImporter.cmake index f6ad72b..6ed576d 100644 --- a/tools/compiler/cmake/Windows/ApexImporter.cmake +++ b/tools/compiler/cmake/Windows/ApexImporter.cmake @@ -18,5 +18,3 @@ SET(APEXIMPORTER_COMPILE_DEFS $<$<CONFIG:release>:${BLASTTOOLS_SLN_RELEASE_COMPILE_DEFS}> ) -#TARGET_LINK_LIBRARIES(NvBlast PUBLIC ${NVTOOLSEXT_LIBRARIES}) -#SET_TARGET_PROPERTIES(NvBlast PROPERTIES LINK_FLAGS "/MAP" ) diff --git a/tools/compiler/cmake/Windows/AuthoringTool.cmake b/tools/compiler/cmake/Windows/AuthoringTool.cmake index f981c1f..3dfc954 100644 --- a/tools/compiler/cmake/Windows/AuthoringTool.cmake +++ b/tools/compiler/cmake/Windows/AuthoringTool.cmake @@ -18,5 +18,3 @@ SET(AUTHORTINGTOOL_COMPILE_DEFS $<$<CONFIG:release>:${BLASTTOOLS_SLN_RELEASE_COMPILE_DEFS}> ) -#TARGET_LINK_LIBRARIES(NvBlast PUBLIC ${NVTOOLSEXT_LIBRARIES}) -#SET_TARGET_PROPERTIES(NvBlast PROPERTIES LINK_FLAGS "/MAP" ) diff --git a/tools/compiler/cmake/Windows/LegacyConverter.cmake b/tools/compiler/cmake/Windows/LegacyConverter.cmake index 1a99def..5653bb9 100644 --- a/tools/compiler/cmake/Windows/LegacyConverter.cmake +++ b/tools/compiler/cmake/Windows/LegacyConverter.cmake @@ -18,5 +18,3 @@ SET(LEGACYCONVERTER_COMPILE_DEFS $<$<CONFIG:release>:${BLASTTOOLS_SLN_RELEASE_COMPILE_DEFS}> ) -#TARGET_LINK_LIBRARIES(NvBlast PUBLIC ${NVTOOLSEXT_LIBRARIES}) -#SET_TARGET_PROPERTIES(NvBlast PROPERTIES LINK_FLAGS "/MAP" ) |