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 /samples/compiler/cmake/windows | |
| 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 'samples/compiler/cmake/windows')
| -rw-r--r-- | samples/compiler/cmake/windows/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | samples/compiler/cmake/windows/SampleAssetViewer.cmake | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/samples/compiler/cmake/windows/CMakeLists.txt b/samples/compiler/cmake/windows/CMakeLists.txt index 6820dde..3d007ea 100644 --- a/samples/compiler/cmake/windows/CMakeLists.txt +++ b/samples/compiler/cmake/windows/CMakeLists.txt @@ -28,9 +28,9 @@ ENDIF(CMAKE_CL_64) SET(SAMPLES_SLN_COMPILE_DEFS _UNICODE;UNICODE;WIN32;WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_RUNTIME_LIBRARY_MISMATCH;__GFSDK_DX11__;) #NvBlastExt doesn't have the _CONSOLE flag -SET(SAMPLES_SLN_DEBUG_COMPILE_DEFS _DEBUG;NV_DEBUG=1;) -SET(SAMPLES_SLN_CHECKED_COMPILE_DEFS NDEBUG;NV_CHECKED=1;) -SET(SAMPLES_SLN_PROFILE_COMPILE_DEFS NDEBUG;NV_PROFILE=1;) +SET(SAMPLES_SLN_DEBUG_COMPILE_DEFS _DEBUG;NV_DEBUG=1;NV_NVTX=1;) +SET(SAMPLES_SLN_CHECKED_COMPILE_DEFS NDEBUG;NV_CHECKED=1;NV_NVTX=1;) +SET(SAMPLES_SLN_PROFILE_COMPILE_DEFS NDEBUG;NV_PROFILE=1;NV_NVTX=1;) SET(SAMPLES_SLN_RELEASE_COMPILE_DEFS NDEBUG;) IF(CMAKE_CL_64) diff --git a/samples/compiler/cmake/windows/SampleAssetViewer.cmake b/samples/compiler/cmake/windows/SampleAssetViewer.cmake index 172b2ea..20b9f67 100644 --- a/samples/compiler/cmake/windows/SampleAssetViewer.cmake +++ b/samples/compiler/cmake/windows/SampleAssetViewer.cmake @@ -19,7 +19,3 @@ SET(SAMPLEASSETVIEWER_COMPILE_DEFS ) SET(SAMPLEASSETVIEWER_LINK_FLAGS "/SUBSYSTEM:WINDOWS") - - -#TARGET_LINK_LIBRARIES(NvBlast PUBLIC ${NVTOOLSEXT_LIBRARIES}) -#SET_TARGET_PROPERTIES(NvBlast PROPERTIES LINK_FLAGS "/MAP" ) |